[maven-release-plugin] prepare release ebean-parent-13.9.1

Bump ebean-agent to 13.9.1 - no effective change
Merge pull request #2815 from ebean-orm/feature/2814-nestedUseSavepoint
2024-04-21 10:51:47 +00:00 · 2022-09-02 09:16:01 +12:00 · 2022-09-02 09:10:15 +12:00 · 2022-09-02 08:20:53 +12:00 · 2022-09-02 08:19:03 +12:00 · 2022-09-02 08:18:25 +12:00
62 changed files with 412 additions and 269 deletions
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1</version>
  </parent>

  <name>ebean-clickhouse</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
@@ -35,18 +35,18 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

  </dependencies>

  <scm>
-    <tag>ebean-parent-13.9.0</tag>
+    <tag>ebean-parent-13.9.1</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1</version>
  </parent>

  <name>ebean-cockroach</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
@@ -35,18 +35,18 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

  </dependencies>

  <scm>
-    <tag>ebean-parent-13.9.0</tag>
+    <tag>ebean-parent-13.9.1</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1</version>
  </parent>

  <name>ebean-db2</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
@@ -35,18 +35,18 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-db2</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

  </dependencies>

  <scm>
-    <tag>ebean-parent-13.9.0</tag>
+    <tag>ebean-parent-13.9.1</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1</version>
  </parent>

  <name>ebean-h2</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
@@ -35,18 +35,18 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

  </dependencies>

  <scm>
-    <tag>ebean-parent-13.9.0</tag>
+    <tag>ebean-parent-13.9.1</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1</version>
  </parent>

  <name>ebean-hana</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
@@ -35,18 +35,18 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-hana</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

  </dependencies>

  <scm>
-    <tag>ebean-parent-13.9.0</tag>
+    <tag>ebean-parent-13.9.1</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1</version>
  </parent>

  <name>ebean-mariadb</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
@@ -35,18 +35,18 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

  </dependencies>

  <scm>
-    <tag>ebean-parent-13.9.0</tag>
+    <tag>ebean-parent-13.9.1</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1</version>
  </parent>

  <name>ebean-mysql</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
@@ -35,18 +35,18 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

  </dependencies>

  <scm>
-    <tag>ebean-parent-13.9.0</tag>
+    <tag>ebean-parent-13.9.1</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1</version>
  </parent>

  <name>ebean-nuodb</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
@@ -35,18 +35,18 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

  </dependencies>

  <scm>
-    <tag>ebean-parent-13.9.0</tag>
+    <tag>ebean-parent-13.9.1</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1</version>
  </parent>

  <name>ebean-oracle</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
@@ -35,18 +35,18 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

  </dependencies>

  <scm>
-    <tag>ebean-parent-13.9.0</tag>
+    <tag>ebean-parent-13.9.1</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1</version>
  </parent>

  <name>ebean-postgres</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
@@ -35,18 +35,18 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

  </dependencies>

  <scm>
-    <tag>ebean-parent-13.9.0</tag>
+    <tag>ebean-parent-13.9.1</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1</version>
  </parent>

  <name>ebean-sqlite</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
@@ -35,18 +35,18 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

  </dependencies>

  <scm>
-    <tag>ebean-parent-13.9.0</tag>
+    <tag>ebean-parent-13.9.1</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1</version>
  </parent>

  <name>ebean-sqlserver</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
@@ -35,18 +35,18 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

  </dependencies>

  <scm>
-    <tag>ebean-parent-13.9.0</tag>
+    <tag>ebean-parent-13.9.1</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1</version>
  </parent>

  <name>ebean-yugabyte</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
@@ -35,18 +35,18 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

  </dependencies>

  <scm>
-    <tag>ebean-parent-13.9.0</tag>
+    <tag>ebean-parent-13.9.1</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1</version>
  </parent>

  <name>ebean (all platforms)</name>
@@ -16,19 +16,19 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-joda-time</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
@@ -41,18 +41,18 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-all</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

  </dependencies>

  <scm>
-    <tag>ebean-parent-13.9.0</tag>
+    <tag>ebean-parent-13.9.1</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1</version>
  </parent>

  <artifactId>composites</artifactId>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1</version>
  </parent>

  <name>ebean api</name>
@@ -2,6 +2,28 @@ package io.ebean;

 /**
 * Thrown when a duplicate is attempted on a unique constraint.
+ * <p>
+ * In terms of catching this exception with the view of continuing processing
+ * using the same transaction look to use {@link Transaction#rollbackAndContinue()}.
+ *
+ * <pre>{@code
+ *
+ *   try (Transaction txn = database.beginTransaction()) {
+ *
+ *     try {
+ *       ...
+ *       database.save(bean);
+ *       database.flush();
+ *     } catch (DuplicateKeyException e) {
+ *       // carry on processing using the transaction
+ *       txn.rollbackAndContinue();
+ *       ...
+ *     }
+ *
+ *     txn.commit();
+ *   }
+ *
+ * }</pre>
 */
 public class DuplicateKeyException extends DataIntegrityException {
  private static final long serialVersionUID = -4771932723285724817L;
@@ -144,6 +144,35 @@ public interface Transaction extends AutoCloseable {
   */
  void rollback(Throwable e) throws PersistenceException;

+  /**
+   * Performs a rollback on the underlying JDBC connection with the intention of
+   * continuing to use this same transaction and performing a commit or rollback
+   * later to complete the transaction.
+   * <p>
+   * Typically used when catching {@link DuplicateKeyException} where we wish to
+   * rollback work done at that point but carry on processing using the transaction.
+   *
+   * <pre>{@code
+   *
+   *   try (Transaction txn = database.beginTransaction()) {
+   *
+   *     try {
+   *       ...
+   *       database.save(bean);
+   *       database.flush();
+   *     } catch (DuplicateKeyException e) {
+   *       // carry on processing using the transaction
+   *       txn.rollbackAndContinue();
+   *       ...
+   *     }
+   *
+   *     txn.commit();
+   *   }
+   *
+   * }</pre>
+   */
+  void rollbackAndContinue();
+
  /**
   * Set when we want nested transactions to use Savepoint's.
   * <p>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.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-13.9.0</tag>
+    <tag>ebean-parent-13.9.1</tag>
  </scm>

  <name>ebean autotune</name>
@@ -26,7 +26,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
      <scope>provided</scope>
    </dependency>

@@ -55,7 +55,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
      <scope>test</scope>
    </dependency>

@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1</version>
  </parent>

  <name>ebean bom</name>
@@ -89,94 +89,94 @@
      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean</artifactId>
-        <version>13.9.0</version>
+        <version>13.9.1</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-api</artifactId>
-        <version>13.9.0</version>
+        <version>13.9.1</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-core</artifactId>
-        <version>13.9.0</version>
+        <version>13.9.1</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-core-type</artifactId>
-        <version>13.9.0</version>
+        <version>13.9.1</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-joda-time</artifactId>
-        <version>13.9.0</version>
+        <version>13.9.1</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-ddl-generator</artifactId>
-        <version>13.9.0</version>
+        <version>13.9.1</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-externalmapping-api</artifactId>
-        <version>13.9.0</version>
+        <version>13.9.1</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>13.9.0</version>
+        <version>13.9.1</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-autotune</artifactId>
-        <version>13.9.0</version>
+        <version>13.9.1</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-querybean</artifactId>
-        <version>13.9.0</version>
+        <version>13.9.1</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>querybean-generator</artifactId>
-        <version>13.9.0</version>
+        <version>13.9.1</version>
        <scope>provided</scope>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>kotlin-querybean-generator</artifactId>
-        <version>13.9.0</version>
+        <version>13.9.1</version>
        <scope>provided</scope>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-test</artifactId>
-        <version>13.9.0</version>
+        <version>13.9.1</version>
        <scope>test</scope>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-postgis</artifactId>
-        <version>13.9.0</version>
+        <version>13.9.1</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-redis</artifactId>
-        <version>13.9.0</version>
+        <version>13.9.1</version>
      </dependency>

    </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1</version>
  </parent>

  <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
@@ -3,7 +3,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.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-13.9.0</tag>
+    <tag>ebean-parent-13.9.1</tag>
  </scm>

  <dependencies>
@@ -41,19 +41,19 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core-type</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
@@ -144,21 +144,21 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
      <scope>test</scope>
    </dependency>

@@ -45,15 +45,14 @@ public final class ScopeTrans {
   * Flag set when nested commit has occurred.
   */
  private boolean nestedCommit;
+  private boolean nestedUseSavepoint;

  public ScopeTrans(boolean rollbackOnChecked, boolean created, SpiTransaction transaction, TxScope txScope) {
-
    this.rollbackOnChecked = rollbackOnChecked;
    this.created = created;
    this.transaction = transaction;
    this.noRollbackFor = txScope.getNoRollbackFor();
    this.rollbackFor = txScope.getRollbackFor();
-
    if (transaction != null) {
      if (!created && txScope.isBatchSet() || txScope.isBatchOnCascadeSet() || txScope.isBatchSizeSet()) {
        restoreBatch = transaction.isBatchMode();
@@ -90,6 +89,14 @@ public final class ScopeTrans {
    return "ScopeTrans " + transaction;
  }

+  void setNestedUseSavepoint() {
+    nestedUseSavepoint = true;
+  }
+
+  boolean isNestedUseSavepoint() {
+    return nestedUseSavepoint;
+  }
+
  /**
   * Return the current/active transaction.
   */
@@ -101,7 +108,6 @@ public final class ScopeTrans {
   * Complete the transaction from enhanced transactional. Try to commit.
   */
  void complete(Object returnOrThrowable, int opCode) {
-
    if (opCode == OPCODE_ATHROW) {
      // exited with a Throwable
      caughtThrowable((Throwable) returnOrThrowable);
@@ -168,7 +174,6 @@ public final class ScopeTrans {
   * Returns the exception and this should be thrown by the calling code.
   */
  public <T extends Throwable> T caughtThrowable(T e) {
-
    if (isRollbackThrowable(e)) {
      rollback(e);
    }
@@ -188,21 +193,17 @@ public final class ScopeTrans {
   * Return true if this throwable should cause a rollback to occur.
   */
  private boolean isRollbackThrowable(Throwable e) {
-
    if (e instanceof Error) {
      return true;
    }
-
    if (noRollbackFor != null) {
      for (Class<? extends Throwable> aNoRollbackFor : noRollbackFor) {
        if (aNoRollbackFor.equals(e.getClass())) {
-
          // explicit no rollback for this one
          return false;
        }
      }
    }
-
    if (rollbackFor != null) {
      for (Class<? extends Throwable> aRollbackFor : rollbackFor) {
        if (aRollbackFor.equals(e.getClass())) {
@@ -211,7 +212,6 @@ public final class ScopeTrans {
        }
      }
    }
-
    // checked exceptions...
    // EJB defaults this to false which is not intuitive IMO
    // Ebean makes this configurable (default to true)
@@ -33,13 +33,26 @@ public final class ScopedTransaction extends SpiTransactionProxy {
    return "ScopedTransaction " + current;
  }

+  @Override
+  public void setNestedUseSavepoint() {
+    current.setNestedUseSavepoint();
+  }
+
+  @Override
+  public boolean isNestedUseSavepoint() {
+    return current.isNestedUseSavepoint();
+  }
+
  /**
   * Push the scope transaction.
   */
  public void push(ScopeTrans scopeTrans) {
-
    if (current != null) {
      stack.push(current);
+      if (current.isNestedUseSavepoint()) {
+        // child scope 'inherits' nestedUseSavepoint
+        scopeTrans.setNestedUseSavepoint();
+      }
    }
    current = scopeTrans;
    transaction = scopeTrans.getTransaction();
@@ -111,6 +124,11 @@ public final class ScopedTransaction extends SpiTransactionProxy {
    }
  }

+  @Override
+  public void rollbackAndContinue() {
+    transaction.rollbackAndContinue();
+  }
+
  @Override
  public void rollback() throws PersistenceException {
    try {
@@ -240,7 +240,7 @@ final class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEve

  @Override
  public boolean isReadOnly() {
-    if (!isActive()) {
+    if (!active) {
      throw new IllegalStateException(illegalStateMessage);
    }
    try {
@@ -252,7 +252,7 @@ final class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEve

  @Override
  public void setReadOnly(boolean readOnly) {
-    if (!isActive()) {
+    if (!active) {
      throw new IllegalStateException(illegalStateMessage);
    }
    try {
@@ -403,7 +403,7 @@ final class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEve
   */
  @Override
  public void setPersistenceContext(SpiPersistenceContext context) {
-    if (!isActive()) {
+    if (!active) {
      throw new IllegalStateException(illegalStateMessage);
    }
    this.persistenceContext = context;
@@ -465,7 +465,7 @@ final class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEve
   */
  @Override
  public Connection getInternalConnection() {
-    if (!isActive()) {
+    if (!active) {
      throw new IllegalStateException(illegalStateMessage);
    }
    return connection;
@@ -508,7 +508,7 @@ final class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEve
   */
  @Override
  public void commit() {
-    if (!isActive()) {
+    if (!active) {
      throw new IllegalStateException(illegalStateMessage);
    }
    // expect AutoCommit so just deactivate / put back into pool
@@ -532,6 +532,11 @@ final class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEve
    throw new IllegalStateException(notExpectedMessage);
  }

+  @Override
+  public void rollbackAndContinue() {
+    // do nothing
+  }
+
  /**
   * Rollback the transaction.
   */
@@ -546,7 +551,7 @@ final class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEve
   */
  @Override
  public void rollback(Throwable cause) throws PersistenceException {
-    if (!isActive()) {
+    if (!active) {
      throw new IllegalStateException(illegalStateMessage);
    }
    // expect AutoCommit so it really has already committed
@@ -424,7 +424,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {

  @Override
  public boolean isReadOnly() {
-    if (!isActive()) {
+    if (!active) {
      throw new IllegalStateException(illegalStateMessage);
    }
    try {
@@ -436,7 +436,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {

  @Override
  public void setReadOnly(boolean readOnly) {
-    if (!isActive()) {
+    if (!active) {
      throw new IllegalStateException(illegalStateMessage);
    }
    try {
@@ -459,7 +459,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {

  @Override
  public final void setBatchMode(boolean batchMode) {
-    if (!isActive()) {
+    if (!active) {
      throw new IllegalStateException(illegalStateMessage);
    }
    this.batchMode = batchMode;
@@ -472,7 +472,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {

  @Override
  public final void setBatchOnCascade(boolean batchMode) {
-    if (!isActive()) {
+    if (!active) {
      throw new IllegalStateException(illegalStateMessage);
    }
    this.batchOnCascadeMode = batchMode;
@@ -666,7 +666,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   */
  @Override
  public final void flush() {
-    if (!isActive()) {
+    if (!active) {
      throw new IllegalStateException(illegalStateMessage);
    }
    internalBatchFlush();
@@ -707,7 +707,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   */
  @Override
  public final void setPersistenceContext(SpiPersistenceContext context) {
-    if (!isActive()) {
+    if (!active) {
      throw new IllegalStateException(illegalStateMessage);
    }
    this.persistenceContext = context;
@@ -776,7 +776,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   */
  @Override
  public Connection getInternalConnection() {
-    if (!isActive()) {
+    if (!active) {
      throw new IllegalStateException(illegalStateMessage);
    }
    return connection;
@@ -920,7 +920,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
    if (rollbackOnly) {
      return;
    }
-    if (!isActive()) {
+    if (!active) {
      throw new IllegalStateException(illegalStateMessage);
    }
    try {
@@ -945,7 +945,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
      rollback();
      return;
    }
-    if (!isActive()) {
+    if (!active) {
      throw new IllegalStateException(illegalStateMessage);
    }
    try {
@@ -1014,6 +1014,22 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
    this.nestedUseSavepoint = true;
  }

+  @Override
+  public void rollbackAndContinue() {
+    if (!active) {
+      throw new IllegalStateException(illegalStateMessage);
+    }
+    internalBatchClear();
+    if (changeLogHolder != null) {
+      changeLogHolder.clear();
+    }
+    try {
+      performRollback();
+    } catch (SQLException ex) {
+      throw new PersistenceException(ex);
+    }
+  }
+
  /**
   * Rollback the transaction.
   */
@@ -1028,7 +1044,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   */
  @Override
  public void rollback(Throwable cause) throws PersistenceException {
-    if (!isActive()) {
+    if (!active) {
      throw new IllegalStateException(illegalStateMessage);
    }
    try {
@@ -1066,7 +1082,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   */
  @Override
  public void end() throws PersistenceException {
-    if (isActive()) {
+    if (active) {
      rollback();
    }
  }
@@ -1075,7 +1091,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   * Return true if the transaction is active.
   */
  @Override
-  public boolean isActive() {
+  public final boolean isActive() {
    return active;
  }

@@ -78,10 +78,14 @@ final class NoTransaction implements SpiTransaction {
  }

  @Override
-  public void rollback() throws PersistenceException {
+  public void rollbackAndContinue() {
    // do nothing
  }

+  @Override
+  public void rollback() throws PersistenceException {
+    // do nothing
+  }

  @Override
  public void rollback(Throwable e) throws PersistenceException {
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.transaction;

 import io.ebeaninternal.api.SpiTransaction;
 import io.ebeaninternal.api.SpiTransactionProxy;
+import io.ebeaninternal.api.TransactionEvent;
 import io.ebeaninternal.server.util.Str;

 import javax.persistence.PersistenceException;
@@ -25,6 +26,7 @@ final class SavepointTransaction extends SpiTransactionProxy {

  private boolean rollbackOnly;
  private int state;
+  private TransactionEvent event;

  SavepointTransaction(SpiTransaction transaction, TransactionManager manager) throws SQLException {
    this.manager = manager;
@@ -40,6 +42,14 @@ final class SavepointTransaction extends SpiTransactionProxy {
    this.logPrefix = transaction.getLogPrefix() + spPrefix;
  }

+  @Override
+  public TransactionEvent getEvent() {
+    if (event == null) {
+      event = new TransactionEvent();
+    }
+    return event;
+  }
+
  @Override
  public String getLogPrefix() {
    return logPrefix;
@@ -69,6 +79,11 @@ final class SavepointTransaction extends SpiTransactionProxy {
    }
  }

+  @Override
+  public void rollbackAndContinue() {
+    throw new UnsupportedOperationException();
+  }
+
  @Override
  public void rollback() throws PersistenceException {
    rollbackSavepoint(null);
@@ -96,4 +96,7 @@ public final class TChangeLogHolder {
    owner.sendChangeLog(changes);
  }

+  void clear() {
+    changes.getChanges().clear();
+  }
 }
@@ -573,7 +573,7 @@ public class TransactionManager implements SpiTransactionManager {
    } else {
      setToScope = false;
      transaction = txnContainer.current();
-      nestedSavepoint = transaction.isNestedUseSavepoint();
+      nestedSavepoint = txnContainer.isNestedUseSavepoint();
    }

    TxType type = txScope.getType();
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1</version>
  </parent>

  <artifactId>ebean-csv-reader</artifactId>
@@ -14,21 +14,21 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
      <scope>test</scope>
    </dependency>

@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1</version>
  </parent>

  <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core-type</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
      <scope>provided</scope>
    </dependency>

@@ -58,7 +58,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-all</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
      <scope>test</scope>
    </dependency>

@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1</version>
  </parent>

  <name>ebean external mapping api</name>
@@ -4,12 +4,12 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1</version>
  </parent>

  <scm>
    <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-13.9.0</tag>
+    <tag>ebean-parent-13.9.1</tag>
  </scm>

  <name>ebean external mapping xml</name>
@@ -21,7 +21,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
@@ -54,21 +54,21 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
      <scope>test</scope>
    </dependency>

@@ -3,7 +3,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>

@@ -14,7 +14,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core-type</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
      <scope>provided</scope>
    </dependency>

@@ -6,7 +6,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.0-SNAPSHOT</version>
+    <version>13.9.1-SNAPSHOT</version>
  </parent>

  <artifactId>ebean-kotlin</artifactId>
@@ -28,7 +28,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.1-SNAPSHOT</version>
      <scope>provided</scope>
    </dependency>

@@ -50,7 +50,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.1-SNAPSHOT</version>
      <scope>test</scope>
    </dependency>

@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1</version>
  </parent>

  <name>ebean postgis</name>
@@ -22,14 +22,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <!-- provided scope -->
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
      <scope>provided</scope>
    </dependency>

@@ -65,7 +65,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
      <scope>test</scope>
    </dependency>

@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1</version>
  </parent>

  <name>ebean querybean</name>
@@ -17,7 +17,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
      <scope>provided</scope>
    </dependency>

@@ -63,21 +63,21 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>querybean-generator</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
      <scope>test</scope>
    </dependency>

@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1</version>
  </parent>

  <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>querybean-generator</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
      <scope>test</scope>
    </dependency>

@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1</version>
  </parent>

  <name>ebean test</name>
@@ -28,20 +28,20 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
@@ -105,14 +105,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-joda-time</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-all</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
      <scope>test</scope>
    </dependency>

@@ -1,16 +1,15 @@
 package org.tests.insert;

-import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.DuplicateKeyException;
 import io.ebean.annotation.Transactional;
+import io.ebean.xtest.BaseTestCase;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.tests.model.draftable.Document;

-import java.sql.SQLException;
 import java.util.List;

 import static org.assertj.core.api.Assertions.assertThat;
@@ -92,14 +91,8 @@ public class TestInsertDuplicateKey extends BaseTestCase {
      DB.getDefault().currentTransaction().flush();
    } catch (DuplicateKeyException e) {
      log.info("duplicate failed but just continue" + e.getMessage());
-      try {
-        // typically we would use transaction.commitAndContinue()
-        // ... this is a rollback and continue type scenario
-        // ... more sensible to use a second transaction that do this
-        DB.getDefault().currentTransaction().connection().rollback();
-      } catch (SQLException e1) {
-        e1.printStackTrace();
-      }
+      // rollback and continue using the transaction
+      DB.getDefault().currentTransaction().rollbackAndContinue();
    }

    Document doc0 = new Document();
@@ -1,12 +1,17 @@
 package org.tests.transaction;

 import io.ebean.*;
+import io.ebean.test.LoggedSql;
 import io.ebean.xtest.BaseTestCase;
 import io.ebean.xtest.IgnorePlatform;
 import io.ebean.annotation.Platform;
+import io.ebeaninternal.api.SpiTransaction;
+import io.ebeaninternal.api.TransactionEvent;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.EBasic;

+import java.util.List;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -60,6 +65,34 @@ public class TestNestedSubTransaction extends BaseTestCase {
    }
  }

+  @IgnorePlatform({Platform.SQLSERVER, Platform.MYSQL, Platform.HANA, Platform.ORACLE})
+  @Test
+  void nestedNested() {
+    LoggedSql.start();
+    try (Transaction txn0 = DB.beginTransaction()) {
+      runNestedMethod();
+      try (Transaction txnAfter = DB.beginTransaction()) {
+        DB.save(new EBasic("startAfter"));
+      }
+    }
+    List<String> sql = LoggedSql.stop();
+    assertThat(sql).hasSize(3);
+    assertThat(sql.get(0)).contains("insert into e_basic").contains("sp[");
+    assertThat(sql.get(1)).contains("insert into e_basic").doesNotContain("sp[");
+    assertThat(sql.get(2)).contains("insert into e_basic").doesNotContain("sp[");
+  }
+
+  void runNestedMethod() {
+    try (Transaction txn0 = DB.beginTransaction()) {
+      txn0.setNestedUseSavepoint();
+      try (Transaction nested = DB.beginTransaction()) {
+        DB.save(new EBasic("nested in sp"));
+        nested.commit();
+      }
+      DB.save(new EBasic("nested"));
+      txn0.commit();
+    }
+  }

  @IgnorePlatform({Platform.SQLSERVER, Platform.MYSQL, Platform.HANA, Platform.ORACLE})
  @Test
@@ -75,10 +108,15 @@ public class TestNestedSubTransaction extends BaseTestCase {

      server.save(bean);

+      TransactionEvent event0 = ((SpiTransaction) txn0).getEvent();
+
      try (Transaction txn1 = server.beginTransaction()) {
        bean.setName("updateNested");
        server.save(bean);

+        TransactionEvent event1 = ((SpiTransaction) txn1).getEvent();
+        assertThat(event1).isNotSameAs(event0);
+
        try (Transaction txn2 = server.beginTransaction()) {
          bean.setName("barney");
          DB.save(bean);
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1</version>
  </parent>

  <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
      <scope>test</scope>
    </dependency>

@@ -43,7 +43,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
      <scope>test</scope>
    </dependency>

@@ -64,14 +64,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
      <scope>test</scope>
    </dependency>

@@ -4,7 +4,7 @@
  <parent>
    <artifactId>platforms</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1</version>
  </parent>

  <artifactId>ebean-platform-all</artifactId>
@@ -14,72 +14,72 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-db2</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-hana</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-hsqldb</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlanywhere</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

  </dependencies>

  <scm>
-    <tag>ebean-parent-13.9.0</tag>
+    <tag>ebean-parent-13.9.1</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>platforms</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1</version>
  </parent>

  <artifactId>ebean-platform-clickhouse</artifactId>
@@ -14,12 +14,12 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

  </dependencies>

  <scm>
-    <tag>ebean-parent-13.9.0</tag>
+    <tag>ebean-parent-13.9.1</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>platforms</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1</version>
  </parent>

  <artifactId>ebean-platform-db2</artifactId>
@@ -14,12 +14,12 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

  </dependencies>

  <scm>
-    <tag>ebean-parent-13.9.0</tag>
+    <tag>ebean-parent-13.9.1</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>platforms</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1</version>
  </parent>

  <artifactId>ebean-platform-h2</artifactId>
@@ -14,7 +14,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <!-- Provided scope so that the H2HistoryTrigger can live in Ebean core
@@ -36,6 +36,6 @@
  </dependencies>

  <scm>
-    <tag>ebean-parent-13.9.0</tag>
+    <tag>ebean-parent-13.9.1</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>platforms</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1</version>
  </parent>

  <artifactId>ebean-platform-hana</artifactId>
@@ -14,12 +14,12 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

  </dependencies>

  <scm>
-    <tag>ebean-parent-13.9.0</tag>
+    <tag>ebean-parent-13.9.1</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>platforms</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1</version>
  </parent>

  <artifactId>ebean-platform-hsqldb</artifactId>
@@ -14,12 +14,12 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

  </dependencies>

  <scm>
-    <tag>ebean-parent-13.9.0</tag>
+    <tag>ebean-parent-13.9.1</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>platforms</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1</version>
  </parent>

  <artifactId>ebean-platform-mariadb</artifactId>
@@ -14,18 +14,18 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

  </dependencies>

  <scm>
-    <tag>ebean-parent-13.9.0</tag>
+    <tag>ebean-parent-13.9.1</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>platforms</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1</version>
  </parent>

  <artifactId>ebean-platform-mysql</artifactId>
@@ -14,7 +14,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
@@ -27,6 +27,6 @@
  </dependencies>

  <scm>
-    <tag>ebean-parent-13.9.0</tag>
+    <tag>ebean-parent-13.9.1</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>platforms</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1</version>
  </parent>

  <artifactId>ebean-platform-nuodb</artifactId>
@@ -14,12 +14,12 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

  </dependencies>

  <scm>
-    <tag>ebean-parent-13.9.0</tag>
+    <tag>ebean-parent-13.9.1</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>platforms</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1</version>
  </parent>

  <artifactId>ebean-platform-oracle</artifactId>
@@ -14,7 +14,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
@@ -27,6 +27,6 @@
  </dependencies>

  <scm>
-    <tag>ebean-parent-13.9.0</tag>
+    <tag>ebean-parent-13.9.1</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1</version>
  </parent>

  <artifactId>platforms</artifactId>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>platforms</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1</version>
  </parent>

  <artifactId>ebean-platform-postgres</artifactId>
@@ -14,7 +14,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
@@ -27,6 +27,6 @@
  </dependencies>

  <scm>
-    <tag>ebean-parent-13.9.0</tag>
+    <tag>ebean-parent-13.9.1</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>platforms</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1</version>
  </parent>

  <artifactId>ebean-platform-sqlanywhere</artifactId>
@@ -14,12 +14,12 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

  </dependencies>

  <scm>
-    <tag>ebean-parent-13.9.0</tag>
+    <tag>ebean-parent-13.9.1</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>platforms</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1</version>
  </parent>

  <artifactId>ebean-platform-sqlite</artifactId>
@@ -14,12 +14,12 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

  </dependencies>

  <scm>
-    <tag>ebean-parent-13.9.0</tag>
+    <tag>ebean-parent-13.9.1</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>platforms</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1</version>
  </parent>

  <artifactId>ebean-platform-sqlserver</artifactId>
@@ -14,7 +14,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1</version>
    </dependency>

    <dependency>
@@ -27,6 +27,6 @@
  </dependencies>

  <scm>
-    <tag>ebean-parent-13.9.0</tag>
+    <tag>ebean-parent-13.9.1</tag>
  </scm>
 </project>
@@ -9,7 +9,7 @@

  <groupId>io.ebean</groupId>
  <artifactId>ebean-parent</artifactId>
-  <version>13.9.0</version>
+  <version>13.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-13.9.0</tag>
+    <tag>ebean-parent-13.9.1</tag>
  </scm>

  <licenses>
@@ -49,8 +49,8 @@
    <ebean-migration.version>13.6.0</ebean-migration.version>
    <ebean-test-containers.version>6.3</ebean-test-containers.version>
    <ebean-datasource.version>8.2</ebean-datasource.version>
-    <ebean-agent.version>13.9.0</ebean-agent.version>
-    <ebean-maven-plugin.version>13.9.0</ebean-maven-plugin.version>
+    <ebean-agent.version>13.9.1</ebean-agent.version>
+    <ebean-maven-plugin.version>13.9.1</ebean-maven-plugin.version>
    <surefire.useModulePath>false</surefire.useModulePath>
  </properties>

@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1</version>
  </parent>

  <name>querybean generator</name>
@@ -15,7 +15,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.1-SNAPSHOT</version>
    </dependency>

    <dependency>
@@ -27,7 +27,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.1-SNAPSHOT</version>
      <scope>test</scope>
    </dependency>

@@ -53,7 +53,7 @@
            <path>
              <groupId>io.ebean</groupId>
              <artifactId>querybean-generator</artifactId>
-              <version>13.9.0-SNAPSHOT</version>
+              <version>13.9.1-SNAPSHOT</version>
            </path>
          </annotationProcessorPaths>
        </configuration>
@@ -35,14 +35,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.1-SNAPSHOT</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.1-SNAPSHOT</version>
      <scope>test</scope>
    </dependency>
Author	SHA1	Message	Date
Rob Bygrave	74321277ff	[maven-release-plugin] prepare release ebean-parent-13.9.1	2022-09-02 09:16:01 +12:00
Rob Bygrave	c60362f6e1	Bump ebean-agent to 13.9.1 - no effective change	2022-09-02 09:10:15 +12:00
Rob BygraveandGitHub	c1320e4184	Merge pull request #2815 from ebean-orm/feature/2814-nestedUseSavepoint #2814 - Change setNestedUseSavepoint() to use 'ScopeTrans' rather than the underlying Transaction	2022-09-02 08:20:53 +12:00
Rob BygraveandGitHub	a7ea2cf3ef	Merge pull request #2820 from ebean-orm/feature/2818-fix-concurrentModOfTransactionEvent #2818 - Fix Concurrent modification of listenerNotify TransactionEvent list	2022-09-02 08:19:03 +12:00
Rob BygraveandGitHub	f86a0ac973	Merge pull request #2819 from ebean-orm/feature/enh-addRollbackAndContinue ENH: Add Transaction.rollbackAndContinue()	2022-09-02 08:18:25 +12:00
Rob Bygrave	bcc21b1c04	#2818 - Fix Concurrent modification of listenerNotify TransactionEvent list The issue fixed here is that SavepointTransaction was effectively using the TransactionEvent of the underlying 'parent' transaction. The fix is for SavepointTransaction to have its own TransactionEvent.	2022-09-01 22:45:17 +12:00
Rob Bygrave	d517dea27f	ENH: Add Transaction.rollbackAndContinue()	2022-09-01 22:26:52 +12:00
Rob Bygrave	7df168f232	ENH: Add Transaction.rollbackAndContinue() Typically useful for handling DuplicateKeyException where we expect DuplicateKeyException to be thrown and catch it with the intention of continuing processing using the same transaction. Note that some databases like Oracle do not require this explicit rollback() and would work without the rollbackAndContinue(). Postgres in particular requires the rollback() call on the underlying connection such that we can continue using that transaction/java.sql.Connection. Note that in the existing test we can see that rollbackAndContinue() is pretty close to being syntactic sugar. I think adding rollbackAndContinue() is justified and complements the existing commitAndContinue().	2022-09-01 17:08:11 +12:00
Rob Bygrave	563340edbd	Bump to 13.9.1-SNAPSHOT after release	2022-09-01 16:47:22 +12:00
Rob Bygrave	28d70cf9c4	[maven-release-plugin] prepare for next development iteration	2022-09-01 12:33:08 +12:00
Rob Bygrave	0dda3e0e93	#2814 - Change setNestedUseSavepoint() to use 'ScopeTrans' rather than the underlying Transaction The reason for this is that ScopedTransaction holds a stack of ScopeTrans and Transaction, but the actual transaction in this stack is often the same instance / shared when nesting. The issue is that currently setNestedUseSavepoint() sets this flag on the _underlying transaction_ and this instance is the same / shared when 'nesting'. This change moves the nestedUseSavepoint flag for ScopedTransaction to be on ScopeTrans (from the underlying transaction).	2022-08-31 11:39:02 +12:00