Fix for #3381 - Empty OneToMany when overflowing LazyLoadBatchSize and mixed queries

14.0.0 via #3295 introduced this bug. #3295 introduced a behaviour where bulk updates clear the persistence context. Now the lazy loading of a BeanCollection works with an assumption that the "parent bean" is in the persistence context (and this assumption is broken with that change for this test case). That is, the bulk update is clearing the persistence context - removing the parent bean BEFORE the lazy loading is invoked ... and that doesn't then work because the parent bean isn't in the persistence context. This fix means that when lazy loading many's, the parent beans are putIfAbsent into the persistence context.
Version 14.0.2
2024-04-21 10:51:47 +00:00 · 2024-04-04 20:23:10 +13:00 · 2024-03-21 22:07:12 +13:00 · 2024-03-21 21:55:02 +13:00 · 2024-03-21 21:51:10 +13:00 · 2024-03-21 00:14:54 +13:00
104 changed files with 794 additions and 402 deletions
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.0.1</version>
+    <version>14.0.2</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

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

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

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

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-db2</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

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

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

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

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-hana</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

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

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mariadb</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

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

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mysql</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

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

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-nuodb</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

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

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-oracle</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

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

@@ -22,13 +22,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

    <dependency>
@@ -47,19 +47,19 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-postgis-types</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

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

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

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

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlite</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

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

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

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

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

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

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

    <dependency>
@@ -41,7 +41,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-jackson-mapper</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

    <dependency>
@@ -60,13 +60,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-all</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

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

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

  <name>ebean api</name>
@@ -2209,6 +2209,15 @@ 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.
   */
@@ -3104,6 +3113,12 @@ 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.
     */
@@ -1601,6 +1601,14 @@ 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>
@@ -1,8 +1,5 @@
 package io.ebean.config;

-import io.avaje.config.Config;
-import io.avaje.config.Configuration;
-
 import java.util.Properties;

 /**
@@ -19,16 +16,6 @@ public class ContainerConfig {
  private String podName;
  private int port;
  private Properties properties;
-  private Configuration configuration;
-
-  public ContainerConfig() {
-    this.configuration = Config.asConfiguration();
-    this.active = configuration.getBool("ebean.cluster.active", active);
-    this.serviceName = configuration.getNullable("ebean.cluster.serviceName", serviceName);
-    this.namespace = configuration.getNullable("ebean.cluster.namespace", namespace);
-    this.podName = configuration.getNullable("ebean.cluster.podName", podName);
-    this.port = configuration.getInt("ebean.cluster.port", 0);
-  }

  /**
   * Return the service name.
@@ -104,7 +91,7 @@ public class ContainerConfig {
   * Return the deployment properties.
   */
  public Properties getProperties() {
-    return properties != null ? properties : configuration.asProperties();
+    return properties;
  }

  /**
@@ -114,4 +101,25 @@ public class ContainerConfig {
    this.properties = properties;
  }

+  /**
+   * Load the settings from properties.
+   */
+  public void loadFromProperties(Properties properties) {
+    this.properties = properties;
+    this.active = getProperty(properties, "ebean.cluster.active", active);
+    this.serviceName = properties.getProperty("ebean.cluster.serviceName", serviceName);
+    this.namespace = properties.getProperty("ebean.cluster.namespace", namespace);
+    this.podName = properties.getProperty("ebean.cluster.podName", podName);
+    String portParam = properties.getProperty("ebean.cluster.port");
+    if (portParam != null) {
+      this.port = Integer.parseInt(portParam);
+    }
+  }
+
+  /**
+   * Return the boolean property setting.
+   */
+  protected boolean getProperty(Properties properties, String key, boolean defaultValue) {
+    return "true".equalsIgnoreCase(properties.getProperty(key, Boolean.toString(defaultValue)));
+  }
 }
@@ -125,6 +125,12 @@ 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.
@@ -2133,6 +2139,7 @@ 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);
@@ -2547,6 +2554,11 @@ public class DatabaseConfig implements DatabaseBuilder.Settings {
    return loadModuleInfo;
  }

+  @Override
+  public boolean isIncludeLabelInSql() {
+    return includeLabelInSql;
+  }
+
  /**
   * @deprecated - migrate to {@link #isLoadModuleInfo()}.
   */
@@ -2563,6 +2575,12 @@ 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;
@@ -769,4 +769,15 @@ 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 + " */ ";
+  }
 }
@@ -76,6 +76,7 @@ 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");
@@ -96,6 +97,7 @@ class DatabaseConfigTest {
    assertTrue(settings.isLoadModuleInfo());
    assertTrue(settings.skipDataSourceCheck());
    assertTrue(settings.readOnlyDatabase());
+    assertTrue(settings.isIncludeLabelInSql());
    assertThat(settings.getLengthCheck()).isEqualTo(LengthCheck.ON);

    assertTrue(settings.isIdGeneratorAutomatic());
@@ -181,6 +183,7 @@ 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());
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.0.1</version>
+    <version>14.0.2</version>
  </parent>

  <name>ebean bom</name>
@@ -89,25 +89,25 @@
      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean</artifactId>
-        <version>14.0.1</version>
+        <version>14.0.2</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-api</artifactId>
-        <version>14.0.1</version>
+        <version>14.0.2</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-core</artifactId>
-        <version>14.0.1</version>
+        <version>14.0.2</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-core-type</artifactId>
-        <version>14.0.1</version>
+        <version>14.0.2</version>
      </dependency>

      <dependency>
@@ -125,13 +125,13 @@
      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-jackson-mapper</artifactId>
-        <version>14.0.1</version>
+        <version>14.0.2</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-ddl-generator</artifactId>
-        <version>14.0.1</version>
+        <version>14.0.2</version>
      </dependency>

      <dependency>
@@ -155,37 +155,37 @@
      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-querybean</artifactId>
-        <version>14.0.1</version>
+        <version>14.0.2</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>querybean-generator</artifactId>
-        <version>14.0.1</version>
+        <version>14.0.2</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>kotlin-querybean-generator</artifactId>
-        <version>14.0.1</version>
+        <version>14.0.2</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-test</artifactId>
-        <version>14.0.1</version>
+        <version>14.0.2</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-redis</artifactId>
-        <version>14.0.1</version>
+        <version>14.0.2</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-spring-txn</artifactId>
-        <version>14.0.1</version>
+        <version>14.0.2</version>
      </dependency>

      <!-- platforms -->
@@ -193,79 +193,79 @@
      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-clickhouse</artifactId>
-        <version>14.0.1</version>
+        <version>14.0.2</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-db2</artifactId>
-        <version>14.0.1</version>
+        <version>14.0.2</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-h2</artifactId>
-        <version>14.0.1</version>
+        <version>14.0.2</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-hana</artifactId>
-        <version>14.0.1</version>
+        <version>14.0.2</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-mariadb</artifactId>
-        <version>14.0.1</version>
+        <version>14.0.2</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-mysql</artifactId>
-        <version>14.0.1</version>
+        <version>14.0.2</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-nuodb</artifactId>
-        <version>14.0.1</version>
+        <version>14.0.2</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-oracle</artifactId>
-        <version>14.0.1</version>
+        <version>14.0.2</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-postgres</artifactId>
-        <version>14.0.1</version>
+        <version>14.0.2</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-postgis</artifactId>
-        <version>14.0.1</version>
+        <version>14.0.2</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-postgis-types</artifactId>
-        <version>14.0.1</version>
+        <version>14.0.2</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-sqlite</artifactId>
-        <version>14.0.1</version>
+        <version>14.0.2</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-sqlserver</artifactId>
-        <version>14.0.1</version>
+        <version>14.0.2</version>
      </dependency>

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

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

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

  <artifactId>ebean-core</artifactId>
@@ -22,7 +22,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

    <dependency>
@@ -46,7 +46,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core-type</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

    <dependency>
@@ -159,21 +159,21 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
      <scope>test</scope>
    </dependency>

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

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

@@ -3,6 +3,7 @@ package io.ebeaninternal.api;
 import io.ebean.CacheMode;
 import io.ebean.bean.BeanCollection;
 import io.ebean.bean.EntityBean;
+import io.ebean.bean.PersistenceContext;
 import io.ebeaninternal.server.core.BindPadding;
 import io.ebeaninternal.server.core.OrmQueryRequest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
@@ -57,17 +58,22 @@ public final class LoadManyRequest extends LoadRequest {
    return loadContext.fullPath();
  }

-  private List<Object> parentIdList(SpiEbeanServer server) {
-    List<Object> idList = new ArrayList<>();
-    BeanPropertyAssocMany<?> many = many();
+  private List<Object> parentIdList(SpiEbeanServer server, BeanPropertyAssocMany<?> many, PersistenceContext pc) {
+    final var idList = new ArrayList<>(loadContext.size());
+    final var descriptor = many.descriptor();
    for (int i = 0; i < loadContext.size(); i++) {
-      BeanCollection<?> bc = loadContext.get(i);
+      final BeanCollection<?> bc = loadContext.get(i);
      if (bc != null) {
-        if (lazy && !originIncluded && bc == originCollection) {
-          originIncluded = true;
-        }
-        idList.add(many.parentId(bc.owner()));
+        final var parent = bc.owner();
+        final var parentId = descriptor.getId(parent);
+        idList.add(parentId);
        bc.setLoader(server); // don't use the load buffer again
+        if (lazy) {
+          descriptor.contextPutIfAbsent(pc, parentId, parent);
+          if (!originIncluded && bc == originCollection) {
+            originIncluded = true;
+          }
+        }
      }
    }
    if (originCollection != null && !originIncluded) {
@@ -75,7 +81,7 @@ public final class LoadManyRequest extends LoadRequest {
      idList.add(many.parentId(originCollection.owner()));
      originCollection.setLoader(server); // don't use the load buffer again
    }
-    if (many.targetDescriptor().isPadInExpression()) {
+    if (descriptor.isPadInExpression()) {
      BindPadding.padIds(idList);
    }
    return idList;
@@ -99,8 +105,9 @@ public final class LoadManyRequest extends LoadRequest {
      query.where().raw(extraWhere.replace("${ta}", "t0").replace("${mta}", "int_"));
    }
    query.setLazyLoadForParents(many);
-    many.addWhereParentIdIn(query, parentIdList(server), loadContext.isUseDocStore());
-    query.setPersistenceContext(loadContext.persistenceContext());
+    final var pc = loadContext.persistenceContext();
+    many.addWhereParentIdIn(query, parentIdList(server, many, pc), loadContext.isUseDocStore());
+    query.setPersistenceContext(pc);
    query.setLoadDescription(lazy ? "lazy" : "query", description());
    if (lazy) {
      query.setLazyLoadBatchSize(loadContext.batchSize());
@@ -3,13 +3,14 @@ package io.ebeaninternal.api;
 import io.ebeaninternal.server.core.SpiOrmQueryRequest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.expression.platform.DbExpressionHandler;
+import io.ebeaninternal.server.expression.platform.DbExpressionRequest;

 import java.util.List;

 /**
 * Request object used for gathering expression sql and bind values.
 */
-public interface SpiExpressionRequest {
+public interface SpiExpressionRequest extends DbExpressionRequest {

  /**
   * Return the DB specific handler for JSON and ARRAY expressions.
@@ -34,11 +35,13 @@ public interface SpiExpressionRequest {
  /**
   * Append to the expression sql without any parsing.
   */
+  @Override
  SpiExpressionRequest append(String expression);

  /**
   * Append to the expression sql without any parsing.
   */
+  @Override
  SpiExpressionRequest append(char c);

  /**
@@ -47,6 +50,7 @@ public interface SpiExpressionRequest {
   * This is a fast path case when expression is a bean property path and falls back to using parse()
   * when that isn't the case.
   */
+  @Override
  SpiExpressionRequest property(String expression);

  /**
@@ -226,6 +226,11 @@ 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.
   */
@@ -63,8 +63,8 @@ final class DefaultBeanLoader {
    Object parentId = parentDesc.getId(parentBean);
    if (pc == null) {
      pc = new DefaultPersistenceContext();
-      parentDesc.contextPut(pc, parentId, parentBean);
    }
+    parentDesc.contextPutIfAbsent(pc, parentId, parentBean);
    boolean useManyIdCache = beanCollection != null && parentDesc.isManyPropCaching() && many.isUseCache();
    if (useManyIdCache) {
      Boolean readOnly = null;
@@ -919,21 +919,27 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
  }

  private void controllerPost() {
-    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;
+    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);
    }
  }

@@ -41,8 +41,8 @@ import io.ebeanservice.docstore.api.mapping.DocMappingBuilder;
 import io.ebeanservice.docstore.api.mapping.DocPropertyMapping;
 import io.ebeanservice.docstore.api.mapping.DocPropertyOptions;
 import io.ebeanservice.docstore.api.support.DocStructure;
-
 import jakarta.persistence.PersistenceException;
+
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
@@ -1182,14 +1182,14 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
   * Returns true if this <code>isLob()</code> or the type will effectively map to a lob.
   */
  @Override
-  public boolean isDbLob() {
+  public boolean isLobForPlatform() {
    if (lob) {
      return true;
    }
    switch (dbType) {
      case DbPlatformType.JSON:
      case DbPlatformType.JSONB:
-        return dbLength == 0; // must be analog to DbPlatformTypeMapping.lookup
+        return dbLength == 0 || dbLength > 4000; // must be analog to DbPlatformTypeMapping.lookup
      case DbPlatformType.JSONBlob:
      case DbPlatformType.JSONClob:
        return true;
@@ -588,10 +588,9 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
  }

  /**
-   * Set the join properties from the parent bean to the child bean.
-   * This is only valid for OneToMany and NOT valid for ManyToMany.
+   * Set the parent bean to the child (update the relationship).
   */
-  public void setJoinValuesToChild(EntityBean parent, EntityBean child, Object mapKeyValue) {
+  public void setParentToChild(EntityBean parent, EntityBean child, Object mapKeyValue) {
    if (mapKeyProperty != null) {
      mapKeyProperty.setValue(child, mapKeyValue);
    }
@@ -602,6 +601,31 @@ 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.
@@ -63,7 +63,7 @@ class DynamicPropertyAggregationFormula extends DynamicPropertyBase {
  }

  @Override
-  public boolean isDbLob() {
+  public boolean isLobForPlatform() {
    return false;
  }

@@ -1,6 +1,5 @@
 package io.ebeaninternal.server.expression.platform;

-import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.server.expression.BitwiseOp;

 /**
@@ -9,7 +8,7 @@ import io.ebeaninternal.server.expression.BitwiseOp;
 abstract class BaseDbExpression implements DbExpressionHandler {

  @Override
-  public void bitwise(SpiExpressionRequest request, String propName, BitwiseOp operator, long flags, String compare, long match) {
+  public void bitwise(DbExpressionRequest request, String propName, BitwiseOp operator, long flags, String compare, long match) {
    final String bitOp = bitOp(operator);
    request.append('(').property(propName).append(' ').append(bitOp).append(" ? ").append(compare).append(" ?)");
  }
@@ -28,7 +27,7 @@ abstract class BaseDbExpression implements DbExpressionHandler {
  /**
   * Common alternative where the bitwise operation is a function (specifically bitand is used - H2 and Oracle).
   */
-  protected void bitwiseFunction(SpiExpressionRequest request, String propName, BitwiseOp operator, String compare) {
+  protected void bitwiseFunction(DbExpressionRequest request, String propName, BitwiseOp operator, String compare) {
    final String funcName = functionName(operator);
    request.append(funcName).append('(').property(propName).append(", ?) ").append(compare).append(" ?");
  }
@@ -1,6 +1,5 @@
 package io.ebeaninternal.server.expression.platform;

-import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.server.expression.Op;

 /**
@@ -9,17 +8,17 @@ import io.ebeaninternal.server.expression.Op;
 class BasicDbExpression extends BaseDbExpression {

  @Override
-  public void json(SpiExpressionRequest request, String propName, String path, Op operator, Object value) {
+  public void json(DbExpressionRequest request, String propName, String path, Op operator, Object value) {
    throw new RuntimeException("JSON expressions only supported on Postgres and Oracle");
  }

  @Override
-  public void arrayContains(SpiExpressionRequest request, String propName, boolean contains, Object... values) {
+  public void arrayContains(DbExpressionRequest request, String propName, boolean contains, Object... values) {
    throw new RuntimeException("ARRAY expressions only supported on Postgres");
  }

  @Override
-  public void arrayIsEmpty(SpiExpressionRequest request, String propName, boolean empty) {
+  public void arrayIsEmpty(DbExpressionRequest request, String propName, boolean empty) {
    throw new RuntimeException("ARRAY expressions only supported on Postgres");
  }
 }
@@ -1,6 +1,5 @@
 package io.ebeaninternal.server.expression.platform;

-import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.server.expression.BitwiseOp;
 import io.ebeaninternal.server.expression.Op;

@@ -12,22 +11,22 @@ public interface DbExpressionHandler {
  /**
   * Write the db platform specific json expression.
   */
-  void json(SpiExpressionRequest request, String propName, String path, Op operator, Object value);
+  void json(DbExpressionRequest request, String propName, String path, Op operator, Object value);

  /**
   * Add SQL for ARRAY CONTAINS expression.
   */
-  void arrayContains(SpiExpressionRequest request, String propName, boolean contains, Object... values);
+  void arrayContains(DbExpressionRequest request, String propName, boolean contains, Object... values);

  /**
   * Add SQL for ARRAY IS EMPTY expression.
   */
-  void arrayIsEmpty(SpiExpressionRequest request, String propName, boolean empty);
+  void arrayIsEmpty(DbExpressionRequest request, String propName, boolean empty);

  /**
   * Add the bitwise expression.
   */
-  void bitwise(SpiExpressionRequest request, String propName, BitwiseOp operator, long flags, String compare, long match);
+  void bitwise(DbExpressionRequest request, String propName, BitwiseOp operator, long flags, String compare, long match);

  /**
   * Performs a "CONCAT" operation for that platform.
@@ -0,0 +1,22 @@
+package io.ebeaninternal.server.expression.platform;
+
+/**
+ * Request building the expression sql.
+ */
+public interface DbExpressionRequest {
+
+  /**
+   * Append to the expression sql without any parsing.
+   */
+  DbExpressionRequest append(String expression);
+
+  /**
+   * Append to the expression sql without any parsing.
+   */
+  DbExpressionRequest append(char c);
+
+  /**
+   * Append to the expression sql with logical property parsing to db columns with logical path prefix.
+   */
+  DbExpressionRequest property(String expression);
+}
@@ -1,6 +1,5 @@
 package io.ebeaninternal.server.expression.platform;

-import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.server.expression.BitwiseOp;

 /**
@@ -9,7 +8,7 @@ import io.ebeaninternal.server.expression.BitwiseOp;
 final class H2DbExpression extends BasicDbExpression {

  @Override
-  public void bitwise(SpiExpressionRequest request, String propName, BitwiseOp operator, long flags, String compare, long match) {
+  public void bitwise(DbExpressionRequest request, String propName, BitwiseOp operator, long flags, String compare, long match) {
    final String funcName = functionName(operator);
    request.append(funcName).append('(').property(propName).append(", cast(? as long)) ").append(compare).append(" cast(? as long)");
  }
@@ -1,6 +1,5 @@
 package io.ebeaninternal.server.expression.platform;

-import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.server.expression.BitwiseOp;
 import io.ebeaninternal.server.expression.Op;

@@ -10,17 +9,17 @@ import io.ebeaninternal.server.expression.Op;
 final class HanaDbExpression extends BaseDbExpression {

  @Override
-  public void bitwise(SpiExpressionRequest request, String propName, BitwiseOp operator, long flags, String compare, long match) {
+  public void bitwise(DbExpressionRequest request, String propName, BitwiseOp operator, long flags, String compare, long match) {
    bitwiseFunction(request, propName, operator, compare);
  }

  @Override
-  public void json(SpiExpressionRequest request, String propName, String path, Op operator, Object value) {
+  public void json(DbExpressionRequest request, String propName, String path, Op operator, Object value) {
    request.append("json_value(").property(propName).append(", '$.").append(path).append("')").append(operator.bind());
  }

  @Override
-  public void arrayIsEmpty(SpiExpressionRequest request, String propName, boolean empty) {
+  public void arrayIsEmpty(DbExpressionRequest request, String propName, boolean empty) {
    request.append("cardinality(").property(propName).append(')');
    if (empty) {
      request.append(" = 0");
@@ -41,7 +40,7 @@ final class HanaDbExpression extends BaseDbExpression {
  }

  @Override
-  public void arrayContains(SpiExpressionRequest request, String propName, boolean contains, Object... values) {
+  public void arrayContains(DbExpressionRequest request, String propName, boolean contains, Object... values) {
    for (int i = 0; i < values.length; i++) {
      if (i > 0) {
        request.append(" and ");
@@ -1,6 +1,5 @@
 package io.ebeaninternal.server.expression.platform;

-import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.server.expression.Op;

 /**
@@ -9,7 +8,7 @@ import io.ebeaninternal.server.expression.Op;
 final class MariaDbExpression extends BasicDbExpression {

  @Override
-  public void json(SpiExpressionRequest request, String propName, String path, Op operator, Object value) {
+  public void json(DbExpressionRequest request, String propName, String path, Op operator, Object value) {
    request.append('(').property(propName).append(" ->> '$.").append(path).append("')").append(operator.bind());
  }
 }
@@ -1,6 +1,5 @@
 package io.ebeaninternal.server.expression.platform;

-import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.server.expression.Op;

 /**
@@ -9,7 +8,7 @@ import io.ebeaninternal.server.expression.Op;
 final class MySqlDbExpression extends BasicDbExpression {

  @Override
-  public void json(SpiExpressionRequest request, String propName, String path, Op operator, Object value) {
+  public void json(DbExpressionRequest request, String propName, String path, Op operator, Object value) {
    request.append('(').property(propName).append(" ->> '$.").append(path).append("')").append(operator.bind());
  }

@@ -1,6 +1,5 @@
 package io.ebeaninternal.server.expression.platform;

-import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.server.expression.BitwiseOp;
 import io.ebeaninternal.server.expression.Op;

@@ -15,7 +14,7 @@ final class OracleDbExpression extends BaseDbExpression {
  }

  @Override
-  public void json(SpiExpressionRequest request, String propName, String path, Op operator, Object value) {
+  public void json(DbExpressionRequest request, String propName, String path, Op operator, Object value) {
    if (operator == Op.EXISTS) {
      request.append("json_exists(").property(propName).append(", '$.").append(path).append("')");
    } else if (operator == Op.NOT_EXISTS) {
@@ -26,17 +25,17 @@ final class OracleDbExpression extends BaseDbExpression {
  }

  @Override
-  public void bitwise(SpiExpressionRequest request, String propName, BitwiseOp operator, long flags, String compare, long match) {
+  public void bitwise(DbExpressionRequest request, String propName, BitwiseOp operator, long flags, String compare, long match) {
    bitwiseFunction(request, propName, operator, compare);
  }

  @Override
-  public void arrayContains(SpiExpressionRequest request, String propName, boolean contains, Object... values) {
+  public void arrayContains(DbExpressionRequest request, String propName, boolean contains, Object... values) {
    throw new IllegalStateException("ARRAY expressions not supported on Oracle");
  }

  @Override
-  public void arrayIsEmpty(SpiExpressionRequest request, String propName, boolean empty) {
+  public void arrayIsEmpty(DbExpressionRequest request, String propName, boolean empty) {
    throw new IllegalStateException("ARRAY expressions not supported on Oracle");
  }
 }
@@ -1,6 +1,5 @@
 package io.ebeaninternal.server.expression.platform;

-import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.server.expression.Op;

 /**
@@ -14,7 +13,7 @@ final class PostgresDbExpression extends BaseDbExpression {
  }

  @Override
-  public void json(SpiExpressionRequest request, String propName, String path, Op operator, Object value) {
+  public void json(DbExpressionRequest request, String propName, String path, Op operator, Object value) {
    String[] paths = path.split("\\.");
    if (paths.length == 1) {
      // (t0.content ->> 'title') = 'Some value'
@@ -34,7 +33,7 @@ final class PostgresDbExpression extends BaseDbExpression {
  }

  @Override
-  public void arrayContains(SpiExpressionRequest request, String propName, boolean contains, Object... values) {
+  public void arrayContains(DbExpressionRequest request, String propName, boolean contains, Object... values) {
    if (!contains) {
      request.append("not (");
    }
@@ -49,7 +48,7 @@ final class PostgresDbExpression extends BaseDbExpression {
  }

  @Override
-  public void arrayIsEmpty(SpiExpressionRequest request, String propName, boolean empty) {
+  public void arrayIsEmpty(DbExpressionRequest request, String propName, boolean empty) {
    request.append("coalesce(cardinality(").property(propName).append("),0)");
    if (empty) {
      request.append(" = 0");
@@ -1,6 +1,5 @@
 package io.ebeaninternal.server.expression.platform;

-import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.server.expression.Op;

 /**
@@ -9,19 +8,19 @@ import io.ebeaninternal.server.expression.Op;
 final class SqlServerDbExpression extends BaseDbExpression {

  @Override
-  public void json(final SpiExpressionRequest request, final String propName,
+  public void json(final DbExpressionRequest request, final String propName,
                   final String path, final Op operator, final Object value) {
    request.append("json_value(").property(propName).append(", '$.").append(path).append("')").append(operator.bind());
  }

  @Override
-  public void arrayContains(final SpiExpressionRequest request, final String propName,
+  public void arrayContains(final DbExpressionRequest request, final String propName,
                            final boolean contains, final Object... values) {
    throw new RuntimeException("ARRAY expressions not supported on Microsoft SQL Server");
  }

  @Override
-  public void arrayIsEmpty(final SpiExpressionRequest request, final String propName, final boolean empty) {
+  public void arrayIsEmpty(final DbExpressionRequest request, final String propName, final boolean empty) {
    throw new RuntimeException("ARRAY expressions not supported on Microsoft SQL Server");
  }
 }
@@ -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 transsaction callbacks
+    // disable flush on query due transaction callbacks
    try {
      for (int i = 0; i < list.size(); i++) {
        if (i % batchSize == 0) {
@@ -172,7 +172,9 @@ final class SaveManyBeans extends SaveManyBase {
          } else if (ebi.isNewOrDirty()) {
            skipSavingThisBean = false;
            // set the parent bean to detailBean
-            many.setJoinValuesToChild(parentBean, detail, mapKeyValue);
+            many.setParentToChild(parentBean, detail, mapKeyValue);
+          } else if (many.setParentToChild(parentBean, detail, mapKeyValue, request.descriptor())) {
+            skipSavingThisBean = false;
          } else {
            skipSavingThisBean = saveRecurseSkippable;
          }
@@ -1,9 +1,6 @@
 package io.ebeaninternal.server.query;

-import io.ebean.CountDistinctOrder;
-import io.ebean.Query;
-import io.ebean.RawSql;
-import io.ebean.RawSqlBuilder;
+import io.ebean.*;
 import io.ebean.annotation.Platform;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.SqlLimitRequest;
@@ -52,11 +49,13 @@ final class CQueryBuilder {
  private final CQueryDraftSupport draftSupport;
  private final DatabasePlatform dbPlatform;
  private final boolean selectCountWithColumnAlias;
+  private final boolean includeLabelInSql;

  /**
   * Create the SqlGenSelect.
   */
-  CQueryBuilder(DatabasePlatform dbPlatform, Binder binder, CQueryHistorySupport historySupport, CQueryDraftSupport draftSupport) {
+  CQueryBuilder(DatabaseBuilder.Settings config, DatabasePlatform dbPlatform, Binder binder, CQueryHistorySupport historySupport, CQueryDraftSupport draftSupport) {
+    this.includeLabelInSql = config.isIncludeLabelInSql();
    this.dbPlatform = dbPlatform;
    this.binder = binder;
    this.draftSupport = draftSupport;
@@ -596,7 +595,7 @@ final class CQueryBuilder {
    }

    private void appendSelectDistinct() {
-      sb.append("select ");
+      sb.append("select ").append(hint()).append(inlineSqlComment());
      if (distinct && !countSingleAttribute) {
        if (request.isInlineCountDistinct()) {
          sb.append("count(");
@@ -609,6 +608,30 @@ 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 ");
@@ -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(dbPlatform, binder, historySupport, new CQueryDraftSupport(draftTableMap));
+    this.queryBuilder = new CQueryBuilder(config, dbPlatform, binder, historySupport, new CQueryDraftSupport(draftTableMap));
  }

  public int forwardOnlyFetchSize() {
@@ -133,6 +133,11 @@ 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
@@ -33,7 +33,7 @@ public interface STreeProperty extends ScalarDataReader<Object> {
  /**
   * Returns true, if this is a lob property from db-perspective.
   */
-  boolean isDbLob();
+  boolean isLobForPlatform();

  /**
   * Return true if the property is an embedded type.
@@ -48,7 +48,7 @@ public final class SqlTreeBuilder {
  private final SpiQuery.TemporalMode temporalMode;
  private SqlTreeNode rootNode;
  private boolean sqlDistinct;
-  private final boolean distinctNoLobs;
+  private final boolean platformDistinctNoLobs;
  private final SqlTreeCommon common;

  /**
@@ -63,7 +63,7 @@ public final class SqlTreeBuilder {
    this.query = null;
    this.subQuery = false;
    this.distinctOnPlatform = false;
-    this.distinctNoLobs = false;
+    this.platformDistinctNoLobs = false;
    this.queryDetail = queryDetail;
    this.predicates = predicates;
    this.temporalMode = SpiQuery.TemporalMode.CURRENT;
@@ -98,7 +98,7 @@ public final class SqlTreeBuilder {
    this.predicates = predicates;
    this.alias = new SqlTreeAlias(request.baseTableAlias(), temporalMode);
    this.distinctOnPlatform = builder.isPlatformDistinctOn();
-    this.distinctNoLobs = builder.isPlatformDistinctNoLobs();
+    this.platformDistinctNoLobs = builder.isPlatformDistinctNoLobs();
    String fromForUpdate = builder.fromForUpdate(query);
    CQueryHistorySupport historySupport = builder.historySupport(query);
    CQueryDraftSupport draftSupport = builder.draftSupport(query);
@@ -269,8 +269,8 @@ public final class SqlTreeBuilder {
    if (joinList != null) {
      joinList.add(selectNode);
    }
-    if (sqlDistinct && distinctNoLobs) {
-      selectNode.unselectLobs();
+    if (sqlDistinct && platformDistinctNoLobs) {
+      selectNode.unselectLobsForPlatform();
    }
    return selectNode;
  }
@@ -82,6 +82,6 @@ interface SqlTreeNode {
  /**
   * Unselect lobs (for distinct queries on DB2 and Oracle).
   */
-  default void unselectLobs() {
+  default void unselectLobsForPlatform() {
  }
 }
@@ -379,16 +379,16 @@ class SqlTreeNodeBean implements SqlTreeNode {


  @Override
-  public void unselectLobs() {
+  public void unselectLobsForPlatform() {
    if (children != null) {
      for (SqlTreeNode child : children) {
-        child.unselectLobs();
+        child.unselectLobsForPlatform();
      }
    }
    if (hasLob()) {
      List<STreeProperty> lst = new ArrayList<>();
      for (STreeProperty prop : properties) {
-        if (!prop.isDbLob()) {
+        if (!prop.isLobForPlatform()) {
          lst.add(prop);
        }
      }
@@ -399,7 +399,7 @@ class SqlTreeNodeBean implements SqlTreeNode {

  private boolean hasLob() {
    for (STreeProperty prop : properties) {
-      if (prop.isDbLob()) {
+      if (prop.isLobForPlatform()) {
        return true;
      }
    }
@@ -250,6 +250,9 @@ 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;
  }

@@ -57,6 +57,7 @@ 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;
@@ -235,6 +236,11 @@ 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) {
@@ -258,6 +264,12 @@ 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();
@@ -732,6 +744,7 @@ 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;
@@ -1069,6 +1082,9 @@ 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");
    }
@@ -29,6 +29,27 @@ 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() {

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
      <scope>provided</scope>
    </dependency>

@@ -65,7 +65,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-all</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
      <scope>test</scope>
    </dependency>

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

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

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

  <name>ebean postgis types</name>
@@ -19,14 +19,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

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

@@ -62,7 +62,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
      <scope>test</scope>
    </dependency>

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

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

@@ -63,14 +63,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-ddl-generator</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
      <scope>test</scope>
    </dependency>

@@ -84,7 +84,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>querybean-generator</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
      <scope>provided</scope>
    </dependency>

@@ -912,6 +912,17 @@ 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>
@@ -68,9 +68,9 @@ class MyInnerTest {

    List<String> sql = LoggedSql.stop();
    assertThat(sql).hasSize(4);
-    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 > ?;");
+    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 > ?;");
  }
 }
@@ -62,6 +62,7 @@ public class QCustomerAndOrTest {
  @Test
  public void testOrWithExists() {
    QCustomer query = Customer.find.typed()
+      .setLabel("hiLabel")
      .alias("_cust")
      .or()
      .name.eq("Superman")
@@ -72,12 +73,12 @@ public class QCustomerAndOrTest {
        .query()
      )
      .endOr()
-      .select(QCustomer.alias().id);
+      .select(QCustomer.Alias.id);

    query.findList();

    assertThat(query.getGeneratedSql()).isEqualTo(
-      "select _cust.id from be_customer _cust where (" +
+      "select /* hiLabel */ _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))"
    );
@@ -284,7 +284,7 @@ public class QCustomerTest {
      .query();

    q.findList();
-    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");
+    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");
  }

  @Test
@@ -296,7 +296,7 @@ public class QCustomerTest {
      .query();

    q.findList();
-    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");
+    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");
  }

  @Test
@@ -22,7 +22,7 @@ import java.util.List;
 import static io.ebean.StdOperators.*;
 import static org.assertj.core.api.Assertions.assertThat;

-public class QOrderTest {
+class QOrderTest {

  private static final QCustomer cu = QCustomer.alias();

@@ -79,6 +79,19 @@ public 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();
@@ -89,12 +102,12 @@ public class QOrderTest {

    final List<String> sql = LoggedSql.stop();
    assertThat(sql).hasSize(2);
-    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");
+    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");
  }

  @Test
-  public void fetchCache() {
+  void fetchCache() {

    new QOrder()
      .status.eq(Order.Status.NEW)
@@ -108,7 +121,7 @@ public class QOrderTest {
  }

  @Test
-  public void viaFetchGraph() {
+  void viaFetchGraph() {

    DB.getDefault();
    LoggedSql.start();
@@ -121,11 +134,11 @@ public class QOrderTest {

    final List<String> sql = LoggedSql.stop();
    assertThat(sql).hasSize(1);
-    assertThat(sql.get(0)).contains("select t0.id, t0.status, t0.ship_date, t0.customer_id from o_order t0 where");
+    assertThat(sql.get(0)).contains("select /* QOrderTest.viaFetchGraph */ t0.id, t0.status, t0.ship_date, t0.customer_id from o_order t0 where");
  }

  @Test
-  public void viaFetchGraph_withJoin() {
+  void viaFetchGraph_withJoin() {

    DB.getDefault();
    LoggedSql.start();
@@ -138,11 +151,11 @@ public class QOrderTest {

    final List<String> sql = LoggedSql.stop();
    assertThat(sql).hasSize(1);
-    assertThat(sql.get(0)).contains("select t0.id, t0.status, t1.id, t1.name from o_order t0 join be_customer t1 on t1.id = t0.customer_id where");
+    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");
  }

  @Test
-  public void viaFetchGraph_withNested() {
+  void viaFetchGraph_withNested() {

    DB.getDefault();
    LoggedSql.start();
@@ -154,13 +167,12 @@ public class QOrderTest {

    final List<String> sql = LoggedSql.stop();
    assertThat(sql).hasSize(1);
-    assertThat(sql.get(0)).contains("select t0.id, t0.status, t0.ship_date, t1.id, t1.name, t1.phone_number from o_order t0 join be_customer t1 on t1.id = t0.customer_id where");
+    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");
  }

  @Test
-  public void viaFetchGraph_withNested_fetchQuery() {
-
-    DB.getDefault();
+  void viaFetchGraph_withNested_fetchQuery() {
+    DB.cacheManager().clearAll();
    LoggedSql.start();

    final Order found = new QOrder()
@@ -172,17 +184,16 @@ public class QOrderTest {

    // assert fetching customer via fetchQuery
    assertThat(sql).hasSize(2);
-    assertThat(sql.get(0)).contains("select t0.id, t0.status, t0.customer_id from o_order t0 where t0.id = ?");
-    assertThat(sql.get(1)).contains("select t0.id, t0.name, t0.phone_number from be_customer t0 where t0.id = ?");
+    assertThat(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(found.getCustomer().getPhoneNumber().getMsisdn()).isEqualTo("Ph1");
  }


  @Test
-  public void viaFetchGraph_withNested_fetchCache() {
-
-    DB.getDefault();
+  void viaFetchGraph_withNested_fetchCache() {
+    DB.cacheManager().clearAll();

    // ensure the customer is loaded in the L2 cache
    new QCustomer().id.eq(customer.getId()).findOne();
@@ -201,11 +212,11 @@ public class QOrderTest {

    // assert we only hit DB for order
    assertThat(sql).hasSize(1);
-    assertThat(sql.get(0)).contains("select t0.id, t0.status, t0.customer_id from o_order t0 where t0.id = ?");
+    assertThat(sql.get(0)).contains("select /* QOrderTest.viaFetchGraph_withNested_fetchQuery */ t0.id, t0.status, t0.customer_id from o_order t0 where t0.id = ?");
  }

  @Test
-  public void select_partial() {
+  void select_partial() {

    DB.getDefault();
    LoggedSql.start();
@@ -218,11 +229,11 @@ public class QOrderTest {

    final List<String> sql = LoggedSql.stop();
    assertThat(sql).hasSize(1);
-    assertThat(sql.get(0)).contains("select t0.id, t0.status, t0.order_date from o_order t0");
+    assertThat(sql.get(0)).contains("select /* QOrderTest.select_partial */ t0.id, t0.status, t0.order_date from o_order t0");
  }

  @Test
-  public void fetch_partial() {
+  void fetch_partial() {

    DB.getDefault();
    LoggedSql.start();
@@ -237,12 +248,12 @@ public class QOrderTest {

    final List<String> sql = LoggedSql.stop();
    assertThat(sql).hasSize(1);
-    assertThat(sql.get(0)).contains("select t0.id, t0.status, t1.id, t1.email, t1.name from o_order t0 join be_customer t1 on t1.id = t0.customer_id");
+    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");

  }

  @Test
-  public void updateQuery() {
+  void updateQuery() {
    LoggedSql.start();
    new QOrder()
      .status.eq(Order.Status.COMPLETE)
@@ -258,7 +269,7 @@ public class QOrderTest {
  }

  @Test
-  public void stdExpression_iLikeConcatCoalesce() {
+  void stdExpression_iLikeConcatCoalesce() {
    QOrder o = QOrder.alias();

    // LOWER(CONCAT(COALESCE(a.name, ""), ":", a.description)) LIKE LOWER(:param)
@@ -273,7 +284,7 @@ public class QOrderTest {
  }

  @Test
-  public void stdExpression_gtCoalesce() {
+  void stdExpression_gtCoalesce() {
    QOrder o = QOrder.alias();

    Query<Order> query = new QOrder()
@@ -288,7 +299,7 @@ public class QOrderTest {

    String sql = query.getGeneratedSql();
    assertThat(sql).contains(" 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 < ?)");
+    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 < ?)");
  }

  @Test
@@ -301,7 +312,7 @@ public class QOrderTest {
      .query();
    query.findList();

-    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)");
+    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)");
  }

  @Test
@@ -314,7 +325,7 @@ public class QOrderTest {
      .query();
    query.findList();

-    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)");
+    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)");
  }

  @Test
@@ -327,7 +338,7 @@ public class QOrderTest {
      .query();
    query.findList();

-    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)");
+    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)");
  }

  @Test
@@ -340,7 +351,7 @@ public class QOrderTest {
      .query();
    query.findList();

-    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)");
+    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)");
  }

  @Test
@@ -353,7 +364,7 @@ public class QOrderTest {
      .query();
    query.findList();

-    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)");
+    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)");
  }

  @Test
@@ -366,7 +377,7 @@ public class QOrderTest {
      .query();
    query.findList();

-    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)");
+    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)");
  }

  @Test
@@ -384,7 +395,7 @@ public class QOrderTest {
      .query();
    query.findList();

-    assertThat(query.getGeneratedSql()).contains("select t0.id from be_customer t0 where t0.registered >= (select max(t0.order_date) from o_order t0)");
+    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)");
  }

  @Test
@@ -399,7 +410,7 @@ public class QOrderTest {
      .query();
    query.findList();

-    assertThat(query.getGeneratedSql()).contains("select t0.id from be_customer t0 where t0.version > (select sum(t0.version) from o_order t0)");
+    assertThat(query.getGeneratedSql()).contains("select /* QOrderTest.gtSubQuery */ t0.id from be_customer t0 where t0.version > (select sum(t0.version) from o_order t0)");
  }

  @Test
@@ -414,7 +425,7 @@ public class QOrderTest {
      .query();
    query.findList();

-    assertThat(query.getGeneratedSql()).contains("select t0.id from be_customer t0 where t0.registered <= (select max(t0.order_date) from o_order t0)");
+    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)");
  }

  @Test
@@ -429,7 +440,7 @@ public class QOrderTest {
      .query();
    query.findList();

-    assertThat(query.getGeneratedSql()).contains("select t0.id from be_customer t0 where t0.registered < (select max(t0.order_date) from o_order t0)");
+    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)");
  }

  @Test
@@ -444,7 +455,7 @@ public class QOrderTest {
      .query();
    query.findList();

-    assertThat(query.getGeneratedSql()).contains("select t0.id from be_customer t0 where t0.registered = (select max(t0.order_date) from o_order t0)");
+    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)");
  }

  @Test
@@ -459,7 +470,7 @@ public class QOrderTest {
      .query();
    query.findList();

-    assertThat(query.getGeneratedSql()).contains("select t0.id from be_customer t0 where t0.registered <> (select max(t0.order_date) from o_order t0)");
+    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)");
  }

  @Test
@@ -20,7 +20,7 @@ class QueryAlsoIfTest {
      .query();

    q.findList();
-    assertThat(q.getGeneratedSql()).isEqualTo("select t0.id, t0.name from be_customer t0 where t0.name is not null and t0.status = ?");
+    assertThat(q.getGeneratedSql()).isEqualTo("select /* QueryAlsoIfTest.apply */ 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 t0.id, t0.name from be_customer t0 where t0.name is not null");
+    assertThat(q.getGeneratedSql()).isEqualTo("select /* QueryAlsoIfTest.notApply */ t0.id, t0.name from be_customer t0 where t0.name is not null");
  }
 }
@@ -3,6 +3,7 @@ ebean.ddl.run=true
 ebean.ddl.initSql=init-db.sql
 ebean.dumpMetricsOnShutdown=true
 ebean.dumpMetricsOptions=sql,hash,loc
+ebean.includeLabelInSql=true

 datasource.default=h2

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

  <artifactId>ebean-redis</artifactId>
@@ -22,28 +22,28 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
      <scope>test</scope>
    </dependency>

@@ -57,7 +57,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>querybean-generator</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
      <scope>provided</scope>
    </dependency>

@@ -1,12 +1,9 @@
 package org.integration;

-import io.ebean.DatabaseBuilder;
-import io.ebean.redis.DuelCache;
-import org.domain.Person;
 import io.ebean.DB;
 import io.ebean.Database;
-import io.ebean.DatabaseFactory;
-import io.ebean.config.DatabaseConfig;
+import io.ebean.redis.DuelCache;
+import org.domain.Person;
 import org.domain.query.QPerson;
 import org.junit.jupiter.api.Test;

@@ -14,21 +11,21 @@ import javax.sql.DataSource;

 import static org.assertj.core.api.Assertions.assertThat;

-public class ClusterTest {
+class ClusterTest {

  private Database createOther(DataSource dataSource) {
-    DatabaseBuilder config = new DatabaseConfig();
-    config.setDataSource(dataSource);
-    config.loadFromProperties();
-    config.setDefaultServer(false);
-    config.setName("other");
-    config.setDdlGenerate(false);
-    config.setDdlRun(false);
-    return DatabaseFactory.create(config);
+    return Database.builder()
+      .dataSource(dataSource)
+      .loadFromProperties()
+      .defaultDatabase(false)
+      .name("other")
+      .ddlGenerate(false)
+      .ddlRun(false)
+      .build();
  }

  @Test
-  public void testBothNear() throws InterruptedException {
+  void testBothNear() throws InterruptedException {
    // ensure the default server exists first
    final Database db = DB.getDefault();
    Database other = createOther(db.pluginApi().dataSource());
@@ -61,7 +58,7 @@ public class ClusterTest {
  }

  @Test
-  public void test() throws InterruptedException {
+  void test() throws InterruptedException {
    // ensure the default server exists first
    final Database db = DB.getDefault();
    Database other = createOther(db.pluginApi().dataSource());
@@ -116,6 +113,6 @@ public class ClusterTest {
  }

  private void allowAsyncMessaging() throws InterruptedException {
-    Thread.sleep(100);
+    Thread.sleep(200);
  }
 }
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.0.1</version>
+    <version>14.0.2</version>
  </parent>

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

@@ -77,7 +77,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
      <scope>test</scope>
    </dependency>

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

  <name>ebean test</name>
@@ -33,20 +33,20 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-ddl-generator</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

    <dependency>
@@ -149,14 +149,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-jackson-mapper</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
      <scope>test</scope>
    </dependency>

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

@@ -164,8 +164,14 @@ 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)
-      .select("id, email, " + concat("lastName", ", ", "firstName") + " as fullName").where().isNotNull("email")
-      .isNotNull("lastName").order().asc("lastName").asDto(ContactDto.class).setLabel("explicitId")
+      .setHint("SomeHint")
+      .select("id, email, " + concat("lastName", ", ", "firstName") + " as fullName")
+      .where()
+      .isNotNull("email")
+      .isNotNull("lastName")
+      .orderBy().asc("lastName")
+      .asDto(ContactDto.class)
+      .setLabel("explicitId")
      .setRelaxedMode();

    List<ContactDto> dtos = query.findList();
@@ -178,7 +184,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
    }

    List<String> sql = LoggedSql.stop();
-    assertSql(sql.get(0)).contains("select t0.id, t0.email, " + concat("t0.last_name", ", ", "t0.first_name")
+    assertSql(sql.get(0)).contains("select /*+ SomeHint */ /* explicitId */ 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");
  }

@@ -26,11 +26,12 @@ public class FetchGroupTest extends BaseTestCase {
      .query()
      .where()
      .ilike("name", "rob")
+      .setLabel("hello")
      .select(fetch);

    query.findList();

-    assertThat(sqlOf(query)).contains("select t0.id, t0.name, t0.status from");
+    assertThat(sqlOf(query)).contains("select /* hello */ t0.id, t0.name, t0.status from");
  }


@@ -12,12 +12,20 @@ class ContainerConfigTest {

  @Test
  void loadFromProperties() {
-    ContainerConfig containerConfig  = new ContainerConfig();
+    Properties p = new Properties();
+    p.setProperty("ebean.cluster.active", "true");
+    p.setProperty("ebean.cluster.serviceName", "a");
+    p.setProperty("ebean.cluster.namespace", "b");
+    p.setProperty("ebean.cluster.podName", "c");
+    p.setProperty("ebean.cluster.port", "42");

-    assertThat(containerConfig.isActive()).isFalse();
-    assertThat(containerConfig.getServiceName()).isNull();
-    assertThat(containerConfig.getNamespace()).isNull();
-    assertThat(containerConfig.getPodName()).isNull();
-    assertThat(containerConfig.getPort()).isEqualTo(0);
+    ContainerConfig containerConfig  = new ContainerConfig();
+    containerConfig.loadFromProperties(p);
+
+    assertThat(containerConfig.isActive()).isTrue();
+    assertThat(containerConfig.getServiceName()).isEqualTo("a");
+    assertThat(containerConfig.getNamespace()).isEqualTo("b");
+    assertThat(containerConfig.getPodName()).isEqualTo("c");
+    assertThat(containerConfig.getPort()).isEqualTo(42);
  }
 }
@@ -0,0 +1,53 @@
+package org.tests.cascade;
+
+import io.ebean.DB;
+import io.ebean.Transaction;
+import io.ebean.xtest.BaseTestCase;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class TestLazyLoadMany extends BaseTestCase {
+
+  COOne create(String parentName, int childCount) {
+    COOne m0 = new COOne(parentName);
+    for (int i = 0; i < childCount; i++) {
+      m0.getChildren().add(new COOneMany(parentName+"_"+i));
+    }
+    return m0;
+  }
+  @Test
+  void loadAfterPCCleared() {
+
+    var m0 = create("tll-m0", 2);
+    var m1 = create("tll-m1", 4);
+    var m2 = create("tll-m2", 5);
+
+    DB.saveAll(m0, m1, m2);
+
+    try (Transaction transaction = DB.beginTransaction()) {
+      List<COOne> children = DB.find(COOne.class)
+        .setLazyLoadBatchSize(2)
+        .where().startsWith("name", "tll-m")
+        .findList();
+
+      assertThat(children).hasSize(3);
+      assertThat(children.get(0).getChildren()).describedAs("invoke lazy loading on children").hasSize(2);
+
+      DB.sqlUpdate("update coone set name = ? where id = ?")
+        .setParameters("new name", children.get(0).getId())
+        .executeNow(); // clears the persistence context in 14.0.0+ due to #3295 #3301
+
+      // the children here were already lazy loaded
+      assertThat(children.get(1).getChildren()).hasSize(4);
+      // this invokes the lazy loading of children AFTER the persistence context was cleared
+      assertThat(children.get(2).getChildren()).hasSize(5);
+
+      transaction.rollback();
+    } finally {
+      DB.deleteAll(List.of(m0, m1, m2));
+    }
+  }
+}
@@ -46,7 +46,7 @@ public class TestElementCollectionCascade extends BaseTestCase {
    assertThat(sql.get(0)).contains("select t0.id, t0.name, t0.version from ecsm_parent t0 where t0.id = ?");
    if (!isPostgresCompatible()) {
      assertThat(sql.get(1)).contains("select t0.ecsm_parent_id, t0.one_id, t0.name, t0.version from ecsm_child t0 where (t0.ecsm_parent_id) in (?)");
-      assertThat(sql.get(2)).contains("select t0.host_id, t0.value from ecsm_values t0 where (t0.host_id) in (?,?)");
+      assertThat(sql.get(2)).contains("select t0.host_id, t0.value from ecsm_values t0 where (t0.host_id) in (?,?,?,?,?)");
    }

    Set<String> vals0 = childVals.get("c0");
@@ -172,9 +172,9 @@ public class TestQueryFindIterate extends BaseTestCase {

    List<String> loggedSql = LoggedSql.stop();

-    assertEquals(2, loggedSql.size());
-    assertThat(trimSql(loggedSql.get(0), 7).contains("select t0.id, t0.status, t0.order_date, t1.id, t1.name, t2.id, t2.order_qty, t2.ship_qty"));
-    assertThat(trimSql(loggedSql.get(1), 7).contains("select t0.order_id, t0.id, t0.ship_time, t0.cretime, t0.updtime, t0.version, t0.order_id from or_order_ship"));
+    assertThat(loggedSql).hasSize(2);
+    assertThat(trimSql(loggedSql.get(0), 7)).contains("select t0.id, t0.status, t0.order_date, t1.id, t1.name, t2.id, t2.order_qty, t2.ship_qty");
+    assertThat(trimSql(loggedSql.get(1), 7)).contains("select t0.order_id, t0.id, t0.ship_time, t0.cretime, t0.updtime, t0.version, t0.order_id from or_order_ship");
  }

  @ForPlatform(Platform.H2)
@@ -1,7 +1,9 @@
 package org.tests.query;

+import io.ebean.Transaction;
 import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
+import io.ebeaninternal.api.SpiTransaction;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Contact;
 import org.tests.model.basic.Customer;
@@ -9,6 +11,7 @@ import org.tests.model.basic.ResetBasicData;

 import java.util.List;

+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;

 public class TestRefToLazyLoadMany extends BaseTestCase {
@@ -26,17 +29,23 @@ public class TestRefToLazyLoadMany extends BaseTestCase {
    assertEquals(3, DB.beanState(c).loadedProps().size());

    // now lazy load the contacts
-    contacts2.size();
+    int expectedSize = contacts2.size();

-    Customer c2 = DB.reference(Customer.class, c.getId());
+    try (Transaction transaction = DB.beginTransaction()) {
+      Customer c2 = DB.reference(Customer.class, c.getId());

-    // we only "loaded" the contacts BeanList and not all of c2
-    List<Contact> contacts = c2.getContacts();
-    // Set<String> loadedProps = DB.beanState(c2).getLoadedProps();
-    // assertEquals(1, loadedProps.size());
+      SpiTransaction spiTxn = (SpiTransaction)transaction;
+      spiTxn.persistenceContext().clear();

-    // now lazy load the contacts
-    contacts.size();
+      // we only "loaded" the contacts BeanList and not all of c2
+      List<Contact> contacts = c2.getContacts();
+      // Set<String> loadedProps = DB.beanState(c2).getLoadedProps();
+      // assertEquals(1, loadedProps.size());

+      // now lazy load the contacts
+      int lazyLoadedSize = contacts.size();
+
+      assertThat(lazyLoadedSize).isEqualTo(expectedSize);
+    }
  }
 }
@@ -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.junit.jupiter.api.Assertions.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;

-public class TestSaveAssociation extends BaseTestCase {
+class TestSaveAssociation extends BaseTestCase {

  @Test
-  public void test() {
+  void test() {

    TSMaster m0 = new TSMaster();
    m0.setName("master1");
@@ -26,7 +26,57 @@ public class TestSaveAssociation extends BaseTestCase {
    TSMaster m0Check = DB.find(TSMaster.class).fetch("details").where().idEq(m0.getId())
      .findOne();

-    assertEquals(2, m0Check.getDetails().size());
+    assertThat(m0Check.getDetails()).hasSize(2);
+    DB.delete(m0);
  }

+
+  @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());
+  }
 }
@@ -17,6 +17,7 @@ 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
@@ -82,9 +82,9 @@

 <!--  <logger name="io.ebean.DDL" level="DEBUG"/>-->

-<!--  <logger name="io.ebean.SQL" level="TRACE"/>-->
-<!--  <logger name="io.ebean.TXN" level="TRACE"/>-->
-<!--  <logger name="io.ebean.SUM" level="TRACE"/>-->
+  <logger name="io.ebean.SQL" level="TRACE"/>
+  <logger name="io.ebean.TXN" level="TRACE"/>
+  <logger name="io.ebean.SUM" level="TRACE"/>

 <!--  <logger name="io.ebean.cache" level="TRACE"/>-->
 <!--  <logger name="io.ebean.cache.REGION" level="TRACE"/>-->
@@ -0,0 +1,52 @@
+# Deploy to Central
+
+```shell
+## confirm on master and building
+git checkout master
+mvn clean verify
+
+## set the appropriate version
+mvs
+
+## run tests and package
+mvn -T 4 clean package
+
+## deploy
+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
+
+## set javax version
+mvs
+
+## deploy javax
+mvn -T 4 clean package
+mvn -T 4 deploy -pl '!composites,!platforms' -Pcentral -DskipTests -DskipStagingRepositoryClose=true -DstagingProgressTimeoutMinutes=9
+
+## checkout / cleanup
+git checkout .
+
+## goto ebean-15x branch
+git checkout ebean-15x
+
+## update ebean-15x branch from master and resolve conflicts
+git merge master
+## resolve conflicts
+## git commit, git push
+
+## set 15.x version
+mvs
+
+## build and deploy 15.x
+mvn -T 4 clean package
+mvn -T 4 deploy -pl '!composites,!platforms' -Pcentral -DskipTests -DskipStagingRepositoryClose=true -DstagingProgressTimeoutMinutes=9
+
+```
+
+
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.0.1</version>
+    <version>14.0.2</version>
  </parent>

  <name>kotlin querybean generator</name>
@@ -21,7 +21,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
      <scope>test</scope>
    </dependency>

@@ -35,7 +35,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
      <scope>test</scope>
    </dependency>

@@ -56,14 +56,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
      <scope>test</scope>
    </dependency>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -15,13 +15,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mysql</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.2</version>
    </dependency>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

  </dependencies>
@@ -9,7 +9,7 @@

  <groupId>io.ebean</groupId>
  <artifactId>ebean-parent</artifactId>
-  <version>14.0.1</version>
+  <version>14.0.2</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.1</ebean-agent.version>
-    <ebean-maven-plugin.version>14.0.1</ebean-maven-plugin.version>
+    <ebean-agent.version>14.0.2</ebean-agent.version>
+    <ebean-maven-plugin.version>14.0.2</ebean-maven-plugin.version>
    <surefire.useModulePath>false</surefire.useModulePath>
  </properties>

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Rob Bygrave	1d413b03dd	Fix for #3381 - Empty OneToMany when overflowing LazyLoadBatchSize and mixed queries 14.0.0 via #3295 introduced this bug. #3295 introduced a behaviour where bulk updates clear the persistence context. Now the lazy loading of a BeanCollection works with an assumption that the "parent bean" is in the persistence context (and this assumption is broken with that change for this test case). That is, the bulk update is clearing the persistence context - removing the parent bean BEFORE the lazy loading is invoked ... and that doesn't then work because the parent bean isn't in the persistence context. This fix means that when lazy loading many's, the parent beans are putIfAbsent into the persistence context.	2024-04-04 20:23:10 +13:00
Rob Bygrave	ab45ad34e0	Version 14.0.2	2024-03-21 22:07:12 +13:00
Rob Bygrave	24b514f851	Bump ebean-agent, no effective change	2024-03-21 21:55:02 +13:00
Rob BygraveandGitHub	582fec7ce4	For #3363 disable flushOnQuery before BeanPersistAdapter post-processors (#3367 )	2024-03-21 21:51:10 +13:00
Rob BygraveandGitHub	0b11c541c8	fix: #3142 Cascading a OneToMany, set the relationship when the child isn't new or dirty (#3366 ) That is, previously the relationship back from the child to the parent was being updated when the child bean was new or dirty BUT NOT in the case when the child bean was loaded and unchanged. This fix includes that case updating the ManyToOne side of the relationship on the child when the save is cascaded.	2024-03-21 00:14:54 +13:00
Rob BygraveandGitHub	540ceab96f	feat: Add query.setHint() to support sql hint as inline comment in select queries (#3365 ) * feat: Add query.setHint() to support sql hint as inline comment in select queries This is for ORM queries only. An ORM query like: new QCustomer() .setHint("FirstRows") .select(QCustomer.Alias.id, QCustomer.Alias.name) .findList(); Produces SQL that includes the hint as an inline comment like: select /+ FirstRows / t0.id, t0.name from customer t0 * Fix test QOrderTest	2024-03-20 21:48:43 +13:00
Rob BygraveandGitHub	8b858a073a	feat: Add includeLabelInSql configuration option to include query label as inline comment in generated sql select (#3362 ) * feat: Add includeLabelInSql configuration option to include query label as inline comment in generated sql select The generated select queries can look like: select /* MyInnerTest.insert_and_find / t0.id, ... Using either query.setLabel() or profile location (which all query beans get by default). This means that tooling looking at sql in the database can more easily relate that sql back to application code. More tests for labels with includeLabelInSql=true * Remove trim when using profileLocation label	2024-03-18 07:38:30 +13:00
Rob BygraveandGitHub	02dafc9838	Merge pull request #3360 from ebean-orm/feature/refactor-DbExpressionRequest Refactor extract DbExpressionRequest interface for db platform specific expressions	2024-03-08 00:53:56 +13:00
Rob Bygrave	0816810d3b	Refactor extract DbExpressionRequest interface for db platform specific expressions This provides a simpler DbExpressionRequest interface for db platform specific expression adapters (rather than the SpiExpressionRequest which has more features that we don't wish to expose to those expression adapters.	2024-03-07 22:45:21 +13:00
Rob Bygrave	1f6e2ee844	No effective change - update test only ClusterTest, increase wait to 200ms	2024-03-07 20:59:41 +13:00
Rob Bygrave	dc00765a98	Merge branch 'fix-for-db2'	2024-03-07 20:45:57 +13:00
Rob Bygrave	a48b2f4ebe	#3354 Use 4000 for DB Lob detection with distinct query - Use 4000 to match the DB2 logic for considering a column a lob (for distinct etc) - Rename distinctNoLobs -> platformDistinctNoLobs - Rename isDbLob() -> isLobForPlatform() - Rename unselectLobs() -> unselectLobsForPlatform()	2024-03-07 20:45:40 +13:00
Rob BygraveandGitHub	837563544f	Merge pull request #3357 from ebean-orm/feature/avaje-config-dependency-ContainerConfig Modify ContainerConfig to remove the avaje-config dependency	2024-03-07 20:23:36 +13:00
Rob Bygrave	fd199f406b	Modify ContainerConfig to remove the avaje-config dependency This actually reverts a change that was made in commit: https://github.com/ebean-orm/ebean/commit/803f1d86428ce3b653276d72207e5a0009b57d16	2024-03-05 21:18:27 +13:00
Roland Praml	a48e96c7e9	FIX broken test for DB2	2024-03-04 10:02:05 +01:00
Rob Bygrave	7ba6e5f67d	Add howto-deploy-to-central.md	2024-03-03 22:08:47 +13:00