ebean-test: Add PersistenceContextAccess.clear() for tests that need to clear the Persistence Context

To support tests that use a transaction that wraps test setup and running the test logic. The need for this case is to clear the persistence context after the test setup phase.

composites/ebean-clickhouse/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.0.1</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
   </dependencies>

composites/ebean-cockroach/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.0.1</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
   </dependencies>

composites/ebean-db2/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.0.1</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
   </dependencies>

composites/ebean-h2/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.0.1</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
   </dependencies>

composites/ebean-hana/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.0.1</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
   </dependencies>

composites/ebean-mariadb/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.0.1</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
   </dependencies>

composites/ebean-mysql/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.0.1</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
   </dependencies>

composites/ebean-nuodb/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.0.1</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
   </dependencies>

composites/ebean-oracle/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.0.1</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
   </dependencies>

composites/ebean-postgis/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.0.1</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -22,13 +22,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
@@ -47,19 +47,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-postgis-types</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>

composites/ebean-postgres/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.0.1</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
   </dependencies>

composites/ebean-sqlite/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.0.1</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
   </dependencies>

composites/ebean-sqlserver/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.0.1</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
   </dependencies>

composites/ebean-yugabyte/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.0.1</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
   </dependencies>

composites/ebean/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.0.1</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
@@ -41,7 +41,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-jackson-mapper</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
@@ -60,13 +60,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
   </dependencies>

composites/pom.xml

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

ebean-api/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.0.1</version>
   </parent>
 
   <name>ebean api</name>

ebean-api/src/main/java/io/ebean/DatabaseBuilder.java

@@ -2209,15 +2209,6 @@ public interface DatabaseBuilder {
   @Deprecated
   DatabaseBuilder setLoadModuleInfo(boolean loadModuleInfo);
 
-  /**
-   * Set if generated SQL SELECT should include the query label as an
-   * inline SQL comment (to help reference back from the SQL to the code
-   * that executed the query.
-   *
-   * @param includeLabelInSql When true include a SQL inline comment in generated SELECT queries.
-   */
-  DatabaseConfig includeLabelInSql(boolean includeLabelInSql);
-
   /**
    * Set the naming convention to apply to metrics names.
    */
@@ -3113,12 +3104,6 @@ public interface DatabaseBuilder {
      */
     boolean isLoadModuleInfo();
 
-    /**
-     * Return true if generated sql select query should include an inline sql comment with the
-     * query label or profile location label.
-     */
-    boolean isIncludeLabelInSql();
-
     /**
      * Return the naming convention to apply to metrics names.
      */

ebean-api/src/main/java/io/ebean/Query.java

@@ -1601,14 +1601,6 @@ public interface Query<T> extends CancelableQuery {
    */
   Query<T> setLabel(String label);
 
-  /**
-   * Set a SQL query hint.
-   * <p>
-   * This results in an inline comment that immediately follows
-   * after the select keyword in the form: {@code /*+ hint *\/ }
-   */
-  Query<T> setHint(String hint);
-
   /**
    * Set to true if this query should execute against the doc store.
    * <p>

ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java

@@ -125,12 +125,6 @@ public class DatabaseConfig implements DatabaseBuilder.Settings {
    */
   private boolean loadModuleInfo = true;
 
-  /**
-   * When true then include a sql comment in generated SELECT queries with the query
-   * label or profile location label.
-   */
-  private boolean includeLabelInSql;
-
   /**
    * Interesting classes such as entities, embedded, ScalarTypes,
    * Listeners, Finders, Controllers, AttributeConverters etc.
@@ -2139,7 +2133,6 @@ public class DatabaseConfig implements DatabaseBuilder.Settings {
     readOnlyDatabase = p.getBoolean("readOnlyDatabase", readOnlyDatabase);
     autoPersistUpdates = p.getBoolean("autoPersistUpdates", autoPersistUpdates);
     loadModuleInfo = p.getBoolean("loadModuleInfo", loadModuleInfo);
-    includeLabelInSql = p.getBoolean("includeLabelInSql", includeLabelInSql);
     maxCallStack = p.getInt("maxCallStack", maxCallStack);
     dumpMetricsOnShutdown = p.getBoolean("dumpMetricsOnShutdown", dumpMetricsOnShutdown);
     dumpMetricsOptions = p.get("dumpMetricsOptions", dumpMetricsOptions);
@@ -2554,11 +2547,6 @@ public class DatabaseConfig implements DatabaseBuilder.Settings {
     return loadModuleInfo;
   }
 
-  @Override
-  public boolean isIncludeLabelInSql() {
-    return includeLabelInSql;
-  }
-
   /**
    * @deprecated - migrate to {@link #isLoadModuleInfo()}.
    */
@@ -2575,12 +2563,6 @@ public class DatabaseConfig implements DatabaseBuilder.Settings {
     return this;
   }
 
-  @Override
-  public DatabaseConfig includeLabelInSql(boolean includeLabelInSql) {
-    this.includeLabelInSql = includeLabelInSql;
-    return this;
-  }
-
   @Override
   public Function<String, String> getMetricNaming() {
     return metricNaming;

ebean-api/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java

@@ -769,15 +769,4 @@ public class DatabasePlatform {
   public boolean supportsNativeJavaTime() {
     return supportsNativeJavaTime;
   }
-
-  public String inlineSqlComment(String label) {
-    if (label == null) {
-      return "";
-    }
-    return "/* " + label + " */ ";
-  }
-
-  public String inlineSqlHint(String hint) {
-    return "/*+ " + hint + " */ ";
-  }
 }

ebean-api/src/test/java/io/ebean/config/DatabaseConfigTest.java

@@ -76,7 +76,6 @@ class DatabaseConfigTest {
     props.setProperty("skipDataSourceCheck", "true");
     props.setProperty("readOnlyDatabase", "true");
     props.setProperty("lengthCheck", "ON");
-    props.setProperty("includeLabelInSql", "true");
 
     props.setProperty("queryPlan.enable", "true");
     props.setProperty("queryPlan.thresholdMicros", "10000");
@@ -97,7 +96,6 @@ class DatabaseConfigTest {
     assertTrue(settings.isLoadModuleInfo());
     assertTrue(settings.skipDataSourceCheck());
     assertTrue(settings.readOnlyDatabase());
-    assertTrue(settings.isIncludeLabelInSql());
     assertThat(settings.getLengthCheck()).isEqualTo(LengthCheck.ON);
 
     assertTrue(settings.isIdGeneratorAutomatic());
@@ -183,7 +181,6 @@ class DatabaseConfigTest {
     assertEquals(10000L, config.getQueryPlanCaptureMaxTimeMillis());
     assertEquals(10, config.getQueryPlanCaptureMaxCount());
     assertThat(config.getLengthCheck()).isEqualTo(LengthCheck.OFF);
-    assertFalse(config.isIncludeLabelInSql());
 
     config.setLoadModuleInfo(false);
     assertFalse(config.isAutoLoadModuleInfo());

ebean-bom/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.0.1</version>
   </parent>
 
   <name>ebean bom</name>
@@ -89,25 +89,25 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>14.0.2</version>
+        <version>14.0.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>14.0.2</version>
+        <version>14.0.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>14.0.2</version>
+        <version>14.0.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>14.0.2</version>
+        <version>14.0.1</version>
       </dependency>
 
       <dependency>
@@ -125,13 +125,13 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-jackson-mapper</artifactId>
-        <version>14.0.2</version>
+        <version>14.0.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>14.0.2</version>
+        <version>14.0.1</version>
       </dependency>
 
       <dependency>
@@ -155,37 +155,37 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>14.0.2</version>
+        <version>14.0.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>14.0.2</version>
+        <version>14.0.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>14.0.2</version>
+        <version>14.0.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>14.0.2</version>
+        <version>14.0.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>14.0.2</version>
+        <version>14.0.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-spring-txn</artifactId>
-        <version>14.0.2</version>
+        <version>14.0.1</version>
       </dependency>
 
       <!-- platforms -->
@@ -193,79 +193,79 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-clickhouse</artifactId>
-        <version>14.0.2</version>
+        <version>14.0.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-db2</artifactId>
-        <version>14.0.2</version>
+        <version>14.0.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-h2</artifactId>
-        <version>14.0.2</version>
+        <version>14.0.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-hana</artifactId>
-        <version>14.0.2</version>
+        <version>14.0.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-mariadb</artifactId>
-        <version>14.0.2</version>
+        <version>14.0.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-mysql</artifactId>
-        <version>14.0.2</version>
+        <version>14.0.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-nuodb</artifactId>
-        <version>14.0.2</version>
+        <version>14.0.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-oracle</artifactId>
-        <version>14.0.2</version>
+        <version>14.0.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgres</artifactId>
-        <version>14.0.2</version>
+        <version>14.0.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>14.0.2</version>
+        <version>14.0.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis-types</artifactId>
-        <version>14.0.2</version>
+        <version>14.0.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-sqlite</artifactId>
-        <version>14.0.2</version>
+        <version>14.0.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-sqlserver</artifactId>
-        <version>14.0.2</version>
+        <version>14.0.1</version>
       </dependency>
 
     </dependencies>

ebean-core-type/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.0.1</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>

ebean-core/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.0.1</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
@@ -46,7 +46,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
@@ -159,21 +159,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
       <scope>test</scope>
     </dependency>
 

ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java

@@ -226,11 +226,6 @@ public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCod
    */
   ProfileLocation profileLocation();
 
-  /**
-   * Return the SQL hint to include in the query.
-   */
-  String hint();
-
   /**
    * Return the label set on the query.
    */

ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java

@@ -919,27 +919,21 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
   }
 
   private void controllerPost() {
-    boolean old = transaction.isFlushOnQuery();
-    transaction.setFlushOnQuery(false);
-    try {
-      switch (type) {
-        case INSERT:
-          controller.postInsert(this);
-          break;
-        case UPDATE:
-          controller.postUpdate(this);
-          break;
-        case DELETE_SOFT:
-          controller.postSoftDelete(this);
-          break;
-        case DELETE:
-          controller.postDelete(this);
-          break;
-        default:
-          break;
-      }
-    } finally {
-      transaction.setFlushOnQuery(old);
+    switch (type) {
+      case INSERT:
+        controller.postInsert(this);
+        break;
+      case UPDATE:
+        controller.postUpdate(this);
+        break;
+      case DELETE_SOFT:
+        controller.postSoftDelete(this);
+        break;
+      case DELETE:
+        controller.postDelete(this);
+        break;
+      default:
+        break;
     }
   }
 

ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java

@@ -588,9 +588,10 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
   }
 
   /**
-   * Set the parent bean to the child (update the relationship).
+   * Set the join properties from the parent bean to the child bean.
+   * This is only valid for OneToMany and NOT valid for ManyToMany.
    */
-  public void setParentToChild(EntityBean parent, EntityBean child, Object mapKeyValue) {
+  public void setJoinValuesToChild(EntityBean parent, EntityBean child, Object mapKeyValue) {
     if (mapKeyProperty != null) {
       mapKeyProperty.setValue(child, mapKeyValue);
     }
@@ -601,31 +602,6 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
     }
   }
 
-  /**
-   * Return true if the parent bean has been set to the child (updated the relationship).
-   */
-  public boolean setParentToChild(EntityBean parent, EntityBean child, Object mapKeyValue, BeanDescriptor<?> parentDesc) {
-    if (manyToMany
-      || childMasterProperty == null
-      || !child._ebean_getIntercept().isLoadedProperty(childMasterProperty.propertyIndex())) {
-      return false;
-    }
-
-    Object currentParent = childMasterProperty.getValue(child);
-    if (currentParent != null) {
-      Object newId = parentDesc.getId(parent);
-      Object oldId = parentDesc.id(currentParent);
-      if (Objects.equals(newId, oldId)) {
-        return false;
-      }
-    }
-    childMasterProperty.setValueIntercept(child, parent);
-    if (mapKeyProperty != null) {
-      mapKeyProperty.setValue(child, mapKeyValue);
-    }
-    return true;
-  }
-
   /**
    * Return the order by clause used to order the fetching of the data for
    * this list, set or map.

ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchControl.java

@@ -226,7 +226,7 @@ public final class BatchControl {
   void executeNow(ArrayList<PersistRequest> list) throws BatchedSqlException {
     boolean old = transaction.isFlushOnQuery();
     transaction.setFlushOnQuery(false);
-    // disable flush on query due transaction callbacks
+    // disable flush on query due transsaction callbacks
     try {
       for (int i = 0; i < list.size(); i++) {
         if (i % batchSize == 0) {

ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java

@@ -172,9 +172,7 @@ final class SaveManyBeans extends SaveManyBase {
           } else if (ebi.isNewOrDirty()) {
             skipSavingThisBean = false;
             // set the parent bean to detailBean
-            many.setParentToChild(parentBean, detail, mapKeyValue);
-          } else if (many.setParentToChild(parentBean, detail, mapKeyValue, request.descriptor())) {
-            skipSavingThisBean = false;
+            many.setJoinValuesToChild(parentBean, detail, mapKeyValue);
           } else {
             skipSavingThisBean = saveRecurseSkippable;
           }

ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java

@@ -1,6 +1,9 @@
 package io.ebeaninternal.server.query;
 
-import io.ebean.*;
+import io.ebean.CountDistinctOrder;
+import io.ebean.Query;
+import io.ebean.RawSql;
+import io.ebean.RawSqlBuilder;
 import io.ebean.annotation.Platform;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.SqlLimitRequest;
@@ -49,13 +52,11 @@ final class CQueryBuilder {
   private final CQueryDraftSupport draftSupport;
   private final DatabasePlatform dbPlatform;
   private final boolean selectCountWithColumnAlias;
-  private final boolean includeLabelInSql;
 
   /**
    * Create the SqlGenSelect.
    */
-  CQueryBuilder(DatabaseBuilder.Settings config, DatabasePlatform dbPlatform, Binder binder, CQueryHistorySupport historySupport, CQueryDraftSupport draftSupport) {
-    this.includeLabelInSql = config.isIncludeLabelInSql();
+  CQueryBuilder(DatabasePlatform dbPlatform, Binder binder, CQueryHistorySupport historySupport, CQueryDraftSupport draftSupport) {
     this.dbPlatform = dbPlatform;
     this.binder = binder;
     this.draftSupport = draftSupport;
@@ -595,7 +596,7 @@ final class CQueryBuilder {
     }
 
     private void appendSelectDistinct() {
-      sb.append("select ").append(hint()).append(inlineSqlComment());
+      sb.append("select ");
       if (distinct && !countSingleAttribute) {
         if (request.isInlineCountDistinct()) {
           sb.append("count(");
@@ -608,30 +609,6 @@ final class CQueryBuilder {
       }
     }
 
-    private String hint() {
-      String hint = query.hint();
-      return hint == null ? "" : dbPlatform.inlineSqlHint(hint);
-    }
-
-    private String inlineSqlComment() {
-      if (!includeLabelInSql) {
-        return "";
-      }
-      SpiQuery.Type type = query.type();
-      if (type == SpiQuery.Type.SQ_EX || type == SpiQuery.Type.SQ_EXISTS) {
-        return "";
-      }
-      final var label = query.label();
-      if (label != null) {
-        return dbPlatform.inlineSqlComment(label);
-      }
-      final var profileLocation = query.profileLocation();
-      if (profileLocation != null) {
-        return dbPlatform.inlineSqlComment(profileLocation.label());
-      }
-      return "";
-    }
-
     private void appendFrom() {
       if (selectClause == null || !selectClause.startsWith("update")) {
         sb.append(" from ");

ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java

@@ -44,7 +44,7 @@ public final class CQueryEngine {
     this.defaultFetchSizeFindList = config.getJdbcFetchSizeFindList();
     this.forwardOnlyHintOnFindIterate = dbPlatform.forwardOnlyHintOnFindIterate();
     this.historySupport = new CQueryHistorySupport(dbPlatform.historySupport(), asOfTableMapping, config.getAsOfSysPeriod());
-    this.queryBuilder = new CQueryBuilder(config, dbPlatform, binder, historySupport, new CQueryDraftSupport(draftTableMap));
+    this.queryBuilder = new CQueryBuilder(dbPlatform, binder, historySupport, new CQueryDraftSupport(draftTableMap));
   }
 
   public int forwardOnlyFetchSize() {

ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java

@@ -133,11 +133,6 @@ final class DefaultFetchGroupQuery<T> implements SpiFetchGroupQuery<T>, SpiQuery
     return this;
   }
 
-  @Override
-  public Query<T> setHint(String hint) {
-    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
-  }
-
   // Everything else deemed invalid
 
   @Override

ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java

@@ -250,9 +250,6 @@ public final class DefaultDtoQuery<T> extends AbstractQuery implements SpiDtoQue
   @Override
   public DtoQuery<T> setLabel(String label) {
     this.label = label;
-    if (ormQuery != null) {
-      ormQuery.setLabel(label);
-    }
     return this;
   }
 

ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java

@@ -57,7 +57,6 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
   private ProfilingListener profilingListener;
   private Type type;
   private String label;
-  private String hint;
   private Mode mode = Mode.NORMAL;
   private boolean usingFuture;
   private Object tenantId;
@@ -236,11 +235,6 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
     return label;
   }
 
-  @Override
-  public final String hint() {
-    return hint;
-  }
-
   @Override
   public final String planLabel() {
     if (label != null) {
@@ -264,12 +258,6 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
     return this;
   }
 
-  @Override
-  public final Query<T> setHint(String hint) {
-    this.hint = hint;
-    return this;
-  }
-
   @Override
   public final boolean isAutoTunable() {
     return nativeSql == null && beanDescriptor.isAutoTunable();
@@ -744,7 +732,6 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
     copy.timeout = timeout;
     copy.mapKey = mapKey;
     copy.id = id;
-    copy.hint = hint;
     copy.label = label;
     copy.nativeSql = nativeSql;
     copy.useBeanCache = useBeanCache;
@@ -1082,9 +1069,6 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
     if (manualId) {
       sb.append("/md");
     }
-    if (hint != null) {
-      sb.append("/h:").append(hint);
-    }
     if (distinct) {
       sb.append("/dt");
     }

ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java

@@ -29,27 +29,6 @@ public class OrmQueryPlanKeyTest extends BaseTest {
     assertSame(query().createQueryPlanKey(), query().createQueryPlanKey());
   }
 
-  @Test
-  public void equals_when_hintIsDifferent_expect_different() {
-    DefaultOrmQuery<Customer> q1 = query();
-    q1.setHint("a");
-    assertDifferent(q1, query());
-
-    DefaultOrmQuery<Customer> q2 = query();
-    q2.setHint("b");
-    assertDifferent(q1, q2);
-  }
-
-  @Test
-  public void equals_when_hintIsSame() {
-    DefaultOrmQuery<Customer> q1 = query();
-    q1.setHint("b");
-    DefaultOrmQuery<Customer> q2 = query();
-    q2.setHint("b");
-
-    assertSame(q1, q2);
-  }
-
   @Test
   public void equals_when_diffTableJoinNull() {
 

ebean-ddl-generator/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.0.1</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -65,7 +65,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
       <scope>test</scope>
     </dependency>
 

ebean-jackson-mapper/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.0.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
       <scope>provided</scope>
     </dependency>
 

ebean-postgis-types/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.0.1</version>
   </parent>
 
   <name>ebean postgis types</name>
@@ -19,14 +19,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <!-- provided scope -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -62,7 +62,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
       <scope>test</scope>
     </dependency>
 

ebean-querybean/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.0.1</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -63,14 +63,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
       <scope>test</scope>
     </dependency>
 
@@ -84,7 +84,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
       <scope>provided</scope>
     </dependency>
 

ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java

@@ -912,17 +912,6 @@ public abstract class TQRootBean<T, R> {
     return root;
   }
 
-  /**
-   * Set a SQL query hint.
-   * <p>
-   * This results in an inline comment that immediately follows
-   * after the select keyword in the form: {@code /*+ hint *\/ }
-   */
-  public R setHint(String hint) {
-    query.setHint(hint);
-    return root;
-  }
-
   /**
    * Set the profile location.
    * <p>

ebean-querybean/src/test/java/org/querytest/MyInnerTest.java

@@ -68,9 +68,9 @@ class MyInnerTest {
 
     List<String> sql = LoggedSql.stop();
     assertThat(sql).hasSize(4);
-    assertThat(sql.get(0)).contains("select /* MyInnerTest.insert_and_find:36 */ t0.id, t0.one, t0.id, t0.one, t0.description from my_inner t0 where t0.one = ?;");
-    assertThat(sql.get(1)).contains("select /* MyInnerTest.insert_and_find:43 */ t0.id, t0.one, t0.id, t0.one, t0.description from my_inner t0 where t0.description = ?;");
-    assertThat(sql.get(2)).contains("select /* MyInnerTest.insert_and_find:54 */ t0.id, t0.one, t0.id, t0.one, t0.description from my_inner t0 where t0.id < ? and t0.description = ?;");
-    assertThat(sql.get(3)).contains("select /* MyInnerTest.insert_and_find:65 */ t0.id, t0.one, t0.id, t0.one, t0.description from my_inner t0 where t0.id < ? and t0.one > ? and t0.one >= ? and t0.one < ? and t0.one <= ? and t0.id > ?;");
+    assertThat(sql.get(0)).contains("select t0.id, t0.one, t0.id, t0.one, t0.description from my_inner t0 where t0.one = ?;");
+    assertThat(sql.get(1)).contains("select t0.id, t0.one, t0.id, t0.one, t0.description from my_inner t0 where t0.description = ?;");
+    assertThat(sql.get(2)).contains("select t0.id, t0.one, t0.id, t0.one, t0.description from my_inner t0 where t0.id < ? and t0.description = ?;");
+    assertThat(sql.get(3)).contains("select t0.id, t0.one, t0.id, t0.one, t0.description from my_inner t0 where t0.id < ? and t0.one > ? and t0.one >= ? and t0.one < ? and t0.one <= ? and t0.id > ?;");
   }
 }

ebean-querybean/src/test/java/org/querytest/QCustomerAndOrTest.java

@@ -62,7 +62,6 @@ public class QCustomerAndOrTest {
   @Test
   public void testOrWithExists() {
     QCustomer query = Customer.find.typed()
-      .setLabel("hiLabel")
       .alias("_cust")
       .or()
       .name.eq("Superman")
@@ -73,12 +72,12 @@ public class QCustomerAndOrTest {
         .query()
       )
       .endOr()
-      .select(QCustomer.Alias.id);
+      .select(QCustomer.alias().id);
 
     query.findList();
 
     assertThat(query.getGeneratedSql()).isEqualTo(
-      "select /* hiLabel */ _cust.id from be_customer _cust where (" +
+      "select _cust.id from be_customer _cust where (" +
         "_cust.name = ? or exists (select 1 from be_contact contact where " +
         "contact.first_name = ? and contact.customer_id = _cust.id))"
     );

ebean-querybean/src/test/java/org/querytest/QCustomerTest.java

@@ -284,7 +284,7 @@ public class QCustomerTest {
       .query();
 
     q.findList();
-    assertThat(q.getGeneratedSql()).isEqualTo("select /* QCustomerTest.filterMany */ t0.id, t0.name, t1.id, t1.first_name, t1.last_name from be_customer t0 left join be_contact t1 on t1.customer_id = t0.id where t1.first_name like ? escape'|' and t1.email is not null order by t0.id");
+    assertThat(q.getGeneratedSql()).isEqualTo("select t0.id, t0.name, t1.id, t1.first_name, t1.last_name from be_customer t0 left join be_contact t1 on t1.customer_id = t0.id where t1.first_name like ? escape'|' and t1.email is not null order by t0.id");
   }
 
   @Test
@@ -296,7 +296,7 @@ public class QCustomerTest {
       .query();
 
     q.findList();
-    assertThat(q.getGeneratedSql()).isEqualTo("select /* QCustomerTest.filterManySingle */ t0.id, t0.name, t1.id, t1.first_name, t1.last_name from be_customer t0 left join be_contact t1 on t1.customer_id = t0.id where t1.first_name like ? escape'|' order by t0.id");
+    assertThat(q.getGeneratedSql()).isEqualTo("select t0.id, t0.name, t1.id, t1.first_name, t1.last_name from be_customer t0 left join be_contact t1 on t1.customer_id = t0.id where t1.first_name like ? escape'|' order by t0.id");
   }
 
   @Test

ebean-querybean/src/test/java/org/querytest/QOrderTest.java

@@ -22,7 +22,7 @@ import java.util.List;
 import static io.ebean.StdOperators.*;
 import static org.assertj.core.api.Assertions.assertThat;
 
-class QOrderTest {
+public class QOrderTest {
 
   private static final QCustomer cu = QCustomer.alias();
 
@@ -79,19 +79,6 @@ class QOrderTest {
     DB.delete(customer);
   }
 
-  @Test
-  void hint() {
-    LoggedSql.start();
-    new QCustomer()
-      .setHint("FirstRows")
-      .select(QCustomer.Alias.id, QCustomer.Alias.name)
-      .findList();
-
-    List<String> sql = LoggedSql.stop();
-    assertThat(sql).hasSize(1);
-    assertThat(sql.get(0)).contains("select /*+ FirstRows */ /* QOrderTest.hint */ t0.id, t0.name from be_customer t0");
-  }
-
   @Test
   void fetchQueryWithBatch() {
     LoggedSql.start();
@@ -102,12 +89,12 @@ class QOrderTest {
 
     final List<String> sql = LoggedSql.stop();
     assertThat(sql).hasSize(2);
-    assertThat(sql.get(0)).contains("select /* QOrderTest.fetchQueryWithBatch */ t0.id, t0.name, t0.phone_number from be_customer t0");
-    assertThat(sql.get(1)).contains("select /* QOrderTest.fetchQueryWithBatch_contacts__query */ t0.customer_id, t0.id, t0.first_name, t0.last_name, t0.email from be_contact t0 where");
+    assertThat(sql.get(0)).contains("select t0.id, t0.name, t0.phone_number from be_customer t0");
+    assertThat(sql.get(1)).contains("select t0.customer_id, t0.id, t0.first_name, t0.last_name, t0.email from be_contact t0 where");
   }
 
   @Test
-  void fetchCache() {
+  public void fetchCache() {
 
     new QOrder()
       .status.eq(Order.Status.NEW)
@@ -121,7 +108,7 @@ class QOrderTest {
   }
 
   @Test
-  void viaFetchGraph() {
+  public void viaFetchGraph() {
 
     DB.getDefault();
     LoggedSql.start();
@@ -134,11 +121,11 @@ class QOrderTest {
 
     final List<String> sql = LoggedSql.stop();
     assertThat(sql).hasSize(1);
-    assertThat(sql.get(0)).contains("select /* QOrderTest.viaFetchGraph */ t0.id, t0.status, t0.ship_date, t0.customer_id from o_order t0 where");
+    assertThat(sql.get(0)).contains("select t0.id, t0.status, t0.ship_date, t0.customer_id from o_order t0 where");
   }
 
   @Test
-  void viaFetchGraph_withJoin() {
+  public void viaFetchGraph_withJoin() {
 
     DB.getDefault();
     LoggedSql.start();
@@ -151,11 +138,11 @@ class QOrderTest {
 
     final List<String> sql = LoggedSql.stop();
     assertThat(sql).hasSize(1);
-    assertThat(sql.get(0)).contains("select /* QOrderTest.viaFetchGraph_withJoin */ t0.id, t0.status, t1.id, t1.name from o_order t0 join be_customer t1 on t1.id = t0.customer_id where");
+    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
-  void viaFetchGraph_withNested() {
+  public void viaFetchGraph_withNested() {
 
     DB.getDefault();
     LoggedSql.start();
@@ -167,12 +154,13 @@ class QOrderTest {
 
     final List<String> sql = LoggedSql.stop();
     assertThat(sql).hasSize(1);
-    assertThat(sql.get(0)).contains("select /* QOrderTest.viaFetchGraph_withNested */ 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");
+    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
-  void viaFetchGraph_withNested_fetchQuery() {
-    DB.cacheManager().clearAll();
+  public void viaFetchGraph_withNested_fetchQuery() {
+
+    DB.getDefault();
     LoggedSql.start();
 
     final Order found = new QOrder()
@@ -184,16 +172,17 @@ class QOrderTest {
 
     // assert fetching customer via fetchQuery
     assertThat(sql).hasSize(2);
-    assertThat(sql.get(0)).contains("select /* QOrderTest.viaFetchGraph_withNested_fetchQuery */ t0.id, t0.status, t0.customer_id from o_order t0 where t0.id = ?");
-    assertThat(sql.get(1)).contains("select /* QOrderTest.viaFetchGraph_withNested_fetchQuery_customer__query */ t0.id, t0.name, t0.phone_number from be_customer t0 where t0.id = ?");
+    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
-  void viaFetchGraph_withNested_fetchCache() {
-    DB.cacheManager().clearAll();
+  public void viaFetchGraph_withNested_fetchCache() {
+
+    DB.getDefault();
 
     // ensure the customer is loaded in the L2 cache
     new QCustomer().id.eq(customer.getId()).findOne();
@@ -212,11 +201,11 @@ class QOrderTest {
 
     // assert we only hit DB for order
     assertThat(sql).hasSize(1);
-    assertThat(sql.get(0)).contains("select /* QOrderTest.viaFetchGraph_withNested_fetchQuery */ t0.id, t0.status, t0.customer_id from o_order t0 where t0.id = ?");
+    assertThat(sql.get(0)).contains("select t0.id, t0.status, t0.customer_id from o_order t0 where t0.id = ?");
   }
 
   @Test
-  void select_partial() {
+  public void select_partial() {
 
     DB.getDefault();
     LoggedSql.start();
@@ -229,11 +218,11 @@ class QOrderTest {
 
     final List<String> sql = LoggedSql.stop();
     assertThat(sql).hasSize(1);
-    assertThat(sql.get(0)).contains("select /* QOrderTest.select_partial */ t0.id, t0.status, t0.order_date from o_order t0");
+    assertThat(sql.get(0)).contains("select t0.id, t0.status, t0.order_date from o_order t0");
   }
 
   @Test
-  void fetch_partial() {
+  public void fetch_partial() {
 
     DB.getDefault();
     LoggedSql.start();
@@ -248,12 +237,12 @@ class QOrderTest {
 
     final List<String> sql = LoggedSql.stop();
     assertThat(sql).hasSize(1);
-    assertThat(sql.get(0)).contains("select /* QOrderTest.fetch_partial */ t0.id, t0.status, t1.id, t1.email, t1.name from o_order t0 join be_customer t1 on t1.id = t0.customer_id");
+    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");
 
   }
 
   @Test
-  void updateQuery() {
+  public void updateQuery() {
     LoggedSql.start();
     new QOrder()
       .status.eq(Order.Status.COMPLETE)
@@ -269,7 +258,7 @@ class QOrderTest {
   }
 
   @Test
-  void stdExpression_iLikeConcatCoalesce() {
+  public void stdExpression_iLikeConcatCoalesce() {
     QOrder o = QOrder.alias();
 
     // LOWER(CONCAT(COALESCE(a.name, ""), ":", a.description)) LIKE LOWER(:param)
@@ -284,7 +273,7 @@ class QOrderTest {
   }
 
   @Test
-  void stdExpression_gtCoalesce() {
+  public void stdExpression_gtCoalesce() {
     QOrder o = QOrder.alias();
 
     Query<Order> query = new QOrder()
@@ -299,7 +288,7 @@ class QOrderTest {
 
     String sql = query.getGeneratedSql();
     assertThat(sql).contains(" where (coalesce(t1.version,0) > ? or t0.id < ?)");
-    assertThat(sql).isEqualTo("select /* QOrderTest.stdExpression_gtCoalesce */ t0.id, t0.status from o_order t0 join be_customer t1 on t1.id = t0.customer_id where (coalesce(t1.version,0) > ? or t0.id < ?)");
+    assertThat(sql).isEqualTo("select t0.id, t0.status from o_order t0 join be_customer t1 on t1.id = t0.customer_id where (coalesce(t1.version,0) > ? or t0.id < ?)");
   }
 
   @Test
@@ -312,7 +301,7 @@ class QOrderTest {
       .query();
     query.findList();
 
-    assertThat(query.getGeneratedSql()).contains("select /* QOrderTest.geSqlSubQuery */ t0.id from be_customer t0 where t0.registered >= (select max(o.order_date) as foo from o_order o)");
+    assertThat(query.getGeneratedSql()).contains("select t0.id from be_customer t0 where t0.registered >= (select max(o.order_date) as foo from o_order o)");
   }
 
   @Test
@@ -325,7 +314,7 @@ class QOrderTest {
       .query();
     query.findList();
 
-    assertThat(query.getGeneratedSql()).contains("select /* QOrderTest.gtSqlSubQuery */ t0.id from be_customer t0 where t0.registered > (select max(o.order_date) as foo from o_order o)");
+    assertThat(query.getGeneratedSql()).contains("select t0.id from be_customer t0 where t0.registered > (select max(o.order_date) as foo from o_order o)");
   }
 
   @Test
@@ -338,7 +327,7 @@ class QOrderTest {
       .query();
     query.findList();
 
-    assertThat(query.getGeneratedSql()).contains("select /* QOrderTest.leSqlSubQuery */ t0.id from be_customer t0 where t0.registered <= (select max(o.order_date) as foo from o_order o)");
+    assertThat(query.getGeneratedSql()).contains("select t0.id from be_customer t0 where t0.registered <= (select max(o.order_date) as foo from o_order o)");
   }
 
   @Test
@@ -351,7 +340,7 @@ class QOrderTest {
       .query();
     query.findList();
 
-    assertThat(query.getGeneratedSql()).contains("select /* QOrderTest.ltSqlSubQuery */ t0.id from be_customer t0 where t0.registered < (select max(o.order_date) as foo from o_order o)");
+    assertThat(query.getGeneratedSql()).contains("select t0.id from be_customer t0 where t0.registered < (select max(o.order_date) as foo from o_order o)");
   }
 
   @Test
@@ -364,7 +353,7 @@ class QOrderTest {
       .query();
     query.findList();
 
-    assertThat(query.getGeneratedSql()).contains("select /* QOrderTest.eqSqlSubQuery */ t0.id from be_customer t0 where t0.registered = (select max(o.order_date) as foo from o_order o)");
+    assertThat(query.getGeneratedSql()).contains("select t0.id from be_customer t0 where t0.registered = (select max(o.order_date) as foo from o_order o)");
   }
 
   @Test
@@ -377,7 +366,7 @@ class QOrderTest {
       .query();
     query.findList();
 
-    assertThat(query.getGeneratedSql()).contains("select /* QOrderTest.neSqlSubQuery */ t0.id from be_customer t0 where t0.registered <> (select max(o.order_date) as foo from o_order o)");
+    assertThat(query.getGeneratedSql()).contains("select t0.id from be_customer t0 where t0.registered <> (select max(o.order_date) as foo from o_order o)");
   }
 
   @Test
@@ -395,7 +384,7 @@ class QOrderTest {
       .query();
     query.findList();
 
-    assertThat(query.getGeneratedSql()).contains("select /* QOrderTest.geSubQuery */ t0.id from be_customer t0 where t0.registered >= (select max(t0.order_date) from o_order t0)");
+    assertThat(query.getGeneratedSql()).contains("select t0.id from be_customer t0 where t0.registered >= (select max(t0.order_date) from o_order t0)");
   }
 
   @Test
@@ -410,7 +399,7 @@ class QOrderTest {
       .query();
     query.findList();
 
-    assertThat(query.getGeneratedSql()).contains("select /* QOrderTest.gtSubQuery */ t0.id from be_customer t0 where t0.version > (select sum(t0.version) from o_order t0)");
+    assertThat(query.getGeneratedSql()).contains("select t0.id from be_customer t0 where t0.version > (select sum(t0.version) from o_order t0)");
   }
 
   @Test
@@ -425,7 +414,7 @@ class QOrderTest {
       .query();
     query.findList();
 
-    assertThat(query.getGeneratedSql()).contains("select /* QOrderTest.leSubQuery */ t0.id from be_customer t0 where t0.registered <= (select max(t0.order_date) from o_order t0)");
+    assertThat(query.getGeneratedSql()).contains("select t0.id from be_customer t0 where t0.registered <= (select max(t0.order_date) from o_order t0)");
   }
 
   @Test
@@ -440,7 +429,7 @@ class QOrderTest {
       .query();
     query.findList();
 
-    assertThat(query.getGeneratedSql()).contains("select /* QOrderTest.ltSubQuery */ t0.id from be_customer t0 where t0.registered < (select max(t0.order_date) from o_order t0)");
+    assertThat(query.getGeneratedSql()).contains("select t0.id from be_customer t0 where t0.registered < (select max(t0.order_date) from o_order t0)");
   }
 
   @Test
@@ -455,7 +444,7 @@ class QOrderTest {
       .query();
     query.findList();
 
-    assertThat(query.getGeneratedSql()).contains("select /* QOrderTest.eqSubQuery */ t0.id from be_customer t0 where t0.registered = (select max(t0.order_date) from o_order t0)");
+    assertThat(query.getGeneratedSql()).contains("select t0.id from be_customer t0 where t0.registered = (select max(t0.order_date) from o_order t0)");
   }
 
   @Test
@@ -470,7 +459,7 @@ class QOrderTest {
       .query();
     query.findList();
 
-    assertThat(query.getGeneratedSql()).contains("select /* QOrderTest.neSubQuery */ t0.id from be_customer t0 where t0.registered <> (select max(t0.order_date) from o_order t0)");
+    assertThat(query.getGeneratedSql()).contains("select t0.id from be_customer t0 where t0.registered <> (select max(t0.order_date) from o_order t0)");
   }
 
   @Test

ebean-querybean/src/test/java/org/querytest/QueryAlsoIfTest.java

@@ -20,7 +20,7 @@ class QueryAlsoIfTest {
       .query();
 
     q.findList();
-    assertThat(q.getGeneratedSql()).isEqualTo("select /* QueryAlsoIfTest.apply */ t0.id, t0.name from be_customer t0 where t0.name is not null and t0.status = ?");
+    assertThat(q.getGeneratedSql()).isEqualTo("select t0.id, t0.name from be_customer t0 where t0.name is not null and t0.status = ?");
   }
 
   @Test
@@ -32,6 +32,6 @@ class QueryAlsoIfTest {
       .query();
 
     q.findList();
-    assertThat(q.getGeneratedSql()).isEqualTo("select /* QueryAlsoIfTest.notApply */ t0.id, t0.name from be_customer t0 where t0.name is not null");
+    assertThat(q.getGeneratedSql()).isEqualTo("select t0.id, t0.name from be_customer t0 where t0.name is not null");
   }
 }

ebean-querybean/src/test/resources/application-test.properties

@@ -3,7 +3,6 @@ ebean.ddl.run=true
 ebean.ddl.initSql=init-db.sql
 ebean.dumpMetricsOnShutdown=true
 ebean.dumpMetricsOptions=sql,hash,loc
-ebean.includeLabelInSql=true
 
 datasource.default=h2
 

ebean-redis/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.0.1</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,28 +22,28 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
       <scope>test</scope>
     </dependency>
 
@@ -57,7 +57,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
       <scope>provided</scope>
     </dependency>
 

ebean-spring-txn/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.0.1</version>
   </parent>
 
   <artifactId>ebean-spring-txn</artifactId>
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -77,7 +77,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
       <scope>test</scope>
     </dependency>
 

ebean-spring-txn/src/test/java/org/example/EbeanSpringModuleTest.java

@@ -2,15 +2,19 @@ package org.example;
 
 import io.ebean.DB;
 import io.ebean.Transaction;
+import io.ebean.test.PersistenceContextAccess;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.annotation.Rollback;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.transaction.annotation.Transactional;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.in;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -42,6 +46,24 @@ public class EbeanSpringModuleTest {
     super();
   }
 
+  @Transactional
+  @Rollback
+  @Test
+  public void testWithRollback() {
+    // setup
+    User user = new User();
+    user.setName("rollback1");
+    DB.save(user);
+
+    // this loads the user into the [transaction scoped] persistence context
+    User found = DB.find(User.class, user.getOid());
+    found.setName("mutated");
+
+    PersistenceContextAccess.clear();
+
+    userService.insideTestRollback(user.getOid());
+  }
+
   /**
    * Test app.
    */

ebean-spring-txn/src/test/java/org/example/UserService.java

@@ -16,4 +16,6 @@ public interface UserService {
 	void batchInsert();
 
 	void requiresNew();
+
+  void insideTestRollback(long oid);
 }

ebean-spring-txn/src/test/java/org/example/UserServiceImpl.java

@@ -12,6 +12,8 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 /**
  * The Class UserServiceImpl.
  *
@@ -28,6 +30,13 @@ public class UserServiceImpl implements UserService, ApplicationContextAware {
     @Autowired
     private Database ebeanServer;
 
+    @Override
+    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
+    public void insideTestRollback(long oid) {
+      User found = ebeanServer.find(User.class, oid);
+      assertThat(found.getName()).isEqualTo("rollback1");
+    }
+
     @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
     public void save(User user) {
         ebeanServer.save(user);

ebean-test/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.0.1</version>
   </parent>
 
   <name>ebean test</name>
@@ -33,20 +33,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
@@ -149,14 +149,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-jackson-mapper</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
       <scope>test</scope>
     </dependency>
 

ebean-test/src/main/java/io/ebean/test/PersistenceContextAccess.java

@@ -0,0 +1,59 @@
+package io.ebean.test;
+
+import io.ebean.Transaction;
+import io.ebean.bean.PersistenceContext;
+import io.ebeaninternal.api.SpiTransaction;
+
+/**
+ * Provides tests access to the persistence context.
+ * <p>
+ * Expected to be used with tests that use Spring test {@code @Rollback} {@code @Transactional}.
+ * These tests have an outer transaction that will rollback. The issue is that test setup code
+ * is now running in the SAME TRANSACTION as the code under test (main code we are testing) and
+ * that the Ebean Persistence Context is transaction scoped - so the test setup code can load
+ * entities into the ebean persistence context during the test setup phase - we SHOULD clear the
+ * persistence context AFTER the setup phase of the test and BEFORE we run the code under test.
+ *
+ * <pre>{@code
+ *
+ * @Test
+ * @Transactional   // spring transactional
+ * @Rollback        // spring test rollback
+ * void myTestWithSpringRollback() {
+ *
+ *   // Test Setup: this MIGHT load entities into the persistence context
+ *   performTestSetup();
+ *
+ *   // clear out the persistence context
+ *   PersistenceContextAccess.clear();
+ *
+ *   // Act
+ *   performActionsWeAreTestingHere();
+ *
+ *   // Assert
+ *   assertThat(...)
+ *
+ * }
+ *
+ * }</pre>
+ */
+public class PersistenceContextAccess {
+
+  /**
+   * Clear the persistence context of the current transaction.
+   * <p>
+   * This is expected to be called after test setup phase and before
+   * the test executes the code we are looking to test - so
+   * AFTER "setup" and BEFORE "act".
+   */
+  public static void clear() {
+    Transaction current = Transaction.current();
+    if (current != null) {
+      SpiTransaction spiTransaction = (SpiTransaction) current;
+      PersistenceContext pc = spiTransaction.persistenceContext();
+      if (pc != null) {
+        pc.clear();
+      }
+    }
+  }
+}

ebean-test/src/test/java/io/ebean/xtest/base/DtoQueryFromOrmTest.java

@@ -164,14 +164,8 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
 
     DtoQuery<ContactDto> query = DB.find(Contact.class)
       // we must explicitly add the id property for DTO query (if we want it)
-      .setHint("SomeHint")
-      .select("id, email, " + concat("lastName", ", ", "firstName") + " as fullName")
-      .where()
-      .isNotNull("email")
-      .isNotNull("lastName")
-      .orderBy().asc("lastName")
-      .asDto(ContactDto.class)
-      .setLabel("explicitId")
+      .select("id, email, " + concat("lastName", ", ", "firstName") + " as fullName").where().isNotNull("email")
+      .isNotNull("lastName").order().asc("lastName").asDto(ContactDto.class).setLabel("explicitId")
       .setRelaxedMode();
 
     List<ContactDto> dtos = query.findList();
@@ -184,7 +178,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
     }
 
     List<String> sql = LoggedSql.stop();
-    assertSql(sql.get(0)).contains("select /*+ SomeHint */ /* explicitId */ t0.id, t0.email, " + concat("t0.last_name", ", ", "t0.first_name")
+    assertSql(sql.get(0)).contains("select t0.id, t0.email, " + concat("t0.last_name", ", ", "t0.first_name")
       + " fullName from contact t0 where t0.email is not null and t0.last_name is not null order by t0.last_name");
   }
 

ebean-test/src/test/java/io/ebean/xtest/base/FetchGroupTest.java

@@ -26,12 +26,11 @@ public class FetchGroupTest extends BaseTestCase {
       .query()
       .where()
       .ilike("name", "rob")
-      .setLabel("hello")
       .select(fetch);
 
     query.findList();
 
-    assertThat(sqlOf(query)).contains("select /* hello */ t0.id, t0.name, t0.status from");
+    assertThat(sqlOf(query)).contains("select t0.id, t0.name, t0.status from");
   }
 
 

ebean-test/src/test/java/org/tests/saveassociation/TestSaveAssociation.java

@@ -6,12 +6,12 @@ import org.junit.jupiter.api.Test;
 import org.tests.model.basic.TSDetail;
 import org.tests.model.basic.TSMaster;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-class TestSaveAssociation extends BaseTestCase {
+public class TestSaveAssociation extends BaseTestCase {
 
   @Test
-  void test() {
+  public void test() {
 
     TSMaster m0 = new TSMaster();
     m0.setName("master1");
@@ -26,57 +26,7 @@ class TestSaveAssociation extends BaseTestCase {
     TSMaster m0Check = DB.find(TSMaster.class).fetch("details").where().idEq(m0.getId())
       .findOne();
 
-    assertThat(m0Check.getDetails()).hasSize(2);
-    DB.delete(m0);
+    assertEquals(2, m0Check.getDetails().size());
   }
 
-
-  @Test
-  void testCascadeSetParent() {
-    // setup
-    TSDetail detail = new TSDetail("master1 detail1");
-    DB.save(detail);
-
-    // act
-    TSMaster m0 = new TSMaster();
-    m0.setName("master2");
-    m0.addDetail(detail);
-    DB.save(m0);
-
-    // assert
-    TSMaster check = DB.find(TSMaster.class).fetch("details")
-      .where().idEq(m0.getId())
-      .findOne();
-
-    assertThat(check.getDetails()).hasSize(1);
-    assertThat(check.getDetails().get(0).getId()).isEqualTo(detail.getId());
-    DB.delete(m0);
-  }
-
-  @Test
-  void testCascadeChangeParent() {
-    // setup
-    TSDetail detail = new TSDetail("master3 detail1");
-    TSMaster m0 = new TSMaster();
-    m0.setName("master3");
-    m0.addDetail(detail);
-    DB.save(m0);
-
-    // act
-    TSMaster m1 = new TSMaster();
-    m1.setName("master4");
-    m1.addDetail(detail);
-    DB.save(m1);
-
-    // assert
-    TSMaster check = DB.find(TSMaster.class).fetch("details")
-      .where().idEq(m1.getId())
-      .findOne();
-
-    assertThat(check.getDetails()).hasSize(1);
-    assertThat(check.getDetails().get(0).getId()).isEqualTo(detail.getId());
-
-    DB.delete(m1);
-    DB.delete(TSMaster.class, m0.getId());
-  }
 }

ebean-test/src/test/resources/ebean.properties

@@ -17,7 +17,6 @@ ebean.encryptKeyManager=org.tests.basic.encrypt.BasicEncyptKeyManager
 #ebean.autoTune.mode=DEFAULT_ON
 #ebean.autoTune.profiling=true
 #ebean.autoTune.profilingUpdateFrequency=5
-ebean.includeLabelInSql=true
 
 ebean.ddl.generate=true
 ebean.ddl.run=true

howto-deploy-to-central.md

@@ -15,9 +15,6 @@ mvn -T 4 clean package
 mvn -T 4 deploy -pl '!composites,!platforms' -Pcentral -DskipTests -DskipStagingRepositoryClose=true -DstagingProgressTimeoutMinutes=9
 
 ## git commit, git tag, git push --tags
-git commit -am 'Version 14.0.2'
-git tag 14.0.2
-git push --tags
 
 ## convert to javax
 ./jakarta-to-javax.sh

kotlin-querybean-generator/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.0.1</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
       <scope>test</scope>
     </dependency>
 
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
       <scope>test</scope>
     </dependency>
 
@@ -56,14 +56,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
       <scope>test</scope>
     </dependency>
 

platforms/all/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.0.1</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,67 +15,67 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hsqldb</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlanywhere</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
   </dependencies>

platforms/clickhouse/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.0.1</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
   </dependencies>

platforms/db2/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.0.1</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
   </dependencies>

platforms/h2/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.0.1</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <!-- Provided scope so that the H2HistoryTrigger can live in Ebean core

platforms/hana/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.0.1</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
   </dependencies>

platforms/hsqldb/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.0.1</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
   </dependencies>

platforms/mariadb/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.0.1</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,13 +15,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
   </dependencies>

platforms/mysql/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.0.1</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
   </dependencies>

platforms/nuodb/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.0.1</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
   </dependencies>

platforms/oracle/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.0.1</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
   </dependencies>

platforms/pom.xml

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

platforms/postgres/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.0.1</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>

platforms/sqlanywhere/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.0.1</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
   </dependencies>

platforms/sqlite/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.0.1</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
   </dependencies>

platforms/sqlserver/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.0.1</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
   </dependencies>

pom.xml

@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>14.0.2</version>
+  <version>14.0.1</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -53,8 +53,8 @@
     <ebean-migration.version>14.0.0</ebean-migration.version>
     <ebean-test-containers.version>7.3</ebean-test-containers.version>
     <ebean-datasource.version>8.12</ebean-datasource.version>
-    <ebean-agent.version>14.0.2</ebean-agent.version>
-    <ebean-maven-plugin.version>14.0.2</ebean-maven-plugin.version>
+    <ebean-agent.version>14.0.1</ebean-agent.version>
+    <ebean-maven-plugin.version>14.0.1</ebean-maven-plugin.version>
     <surefire.useModulePath>false</surefire.useModulePath>
   </properties>
 

querybean-generator/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.0.1</version>
   </parent>
 
   <name>querybean generator</name>

tests/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.0.1</version>
   </parent>
 
   <artifactId>tests</artifactId>

tests/test-java16/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <artifactId>tests</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.0.1</version>
   </parent>
 
   <artifactId>test-java16</artifactId>
@@ -18,7 +18,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-h2</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
@@ -30,14 +30,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
       <scope>provided</scope>
     </dependency>
 

tests/test-kotlin/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <artifactId>tests</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.0.1</version>
   </parent>
 
   <artifactId>test-kotlin</artifactId>
@@ -40,7 +40,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
     </dependency>
 
     <dependency>
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>14.0.2</version>
+      <version>14.0.1</version>
       <scope>test</scope>
     </dependency>