Version 14.10.0

Merge pull request #3574 from ebean-orm/feature/3459-postgres-varchar
#3459 Postgres varchar default to no length (aka text)
2026-09-20 19:17:55 +00:00 · 2025-03-11 21:26:00 +13:00 · 2025-03-11 20:01:26 +13:00 · 2025-03-10 23:56:19 +13:00 · 2025-03-10 23:42:38 +13:00 · 2025-03-10 23:31:35 +13:00
302 changed files with 2650 additions and 1572 deletions
@@ -2,6 +2,7 @@
 name: Build

 on:
+  workflow_dispatch:
  pull_request:
  push:
    branches: master
@@ -4,7 +4,7 @@ name: Yugabyte
 on:
  workflow_dispatch:
  schedule:
-    - cron: '10 3 * * *'
+    - cron: '10 3 * * 3'

 jobs:
  build:
@@ -59,11 +59,6 @@ Work at the highest level of abstraction and drop down levels as needed.
          <img width="222px" src="https://group.foconis.com/download/ci/logo/png-72dpi/logo-quer/foconis-analytics-quer.png">
        </a>
      </td>
-      <td align="center" valign="middle">
-        <a href="https://www.payintech.com/" target="_blank">
-          <img width="222px" src="https://ebean.io/images/sponsor_PayinTech-logo-noir.png">
-        </a>
-      </td>
      <td align="center" valign="middle">
        <a href="https://www.premium-minds.com" target="_blank">
          <img width="222px" src="https://ebean.io/images/logo-med-principal.png">
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.8.0</version>
+    <version>14.10.0</version>
    <relativePath>../..</relativePath>
  </parent>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.8.0</version>
+      <version>14.10.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>14.8.0</version>
+      <version>14.10.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.8.0</version>
+      <version>14.10.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.8.0</version>
+      <version>14.10.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.8.0</version>
+      <version>14.10.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-db2</artifactId>
-      <version>14.8.0</version>
+      <version>14.10.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.8.0</version>
+      <version>14.10.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>14.8.0</version>
+      <version>14.10.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.8.0</version>
+      <version>14.10.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-hana</artifactId>
-      <version>14.8.0</version>
+      <version>14.10.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.8.0</version>
+      <version>14.10.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mariadb</artifactId>
-      <version>14.8.0</version>
+      <version>14.10.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.8.0</version>
+      <version>14.10.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mysql</artifactId>
-      <version>14.8.0</version>
+      <version>14.10.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.8.0</version>
+      <version>14.10.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.8.0</version>
+      <version>14.10.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-net-postgis-types</artifactId>
-      <version>14.8.0</version>
+      <version>14.10.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.8.0</version>
+      <version>14.10.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-nuodb</artifactId>
-      <version>14.8.0</version>
+      <version>14.10.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.8.0</version>
+      <version>14.10.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-oracle</artifactId>
-      <version>14.8.0</version>
+      <version>14.10.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.8.0</version>
+      <version>14.10.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.8.0</version>
+      <version>14.10.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-postgis-types</artifactId>
-      <version>14.8.0</version>
+      <version>14.10.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.8.0</version>
+      <version>14.10.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.8.0</version>
+      <version>14.10.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.8.0</version>
+      <version>14.10.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlite</artifactId>
-      <version>14.8.0</version>
+      <version>14.10.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.8.0</version>
+      <version>14.10.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>14.8.0</version>
+      <version>14.10.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.8.0</version>
+      <version>14.10.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.8.0</version>
+      <version>14.10.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.8.0</version>
+      <version>14.10.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-all</artifactId>
-      <version>14.8.0</version>
+      <version>14.10.0</version>
    </dependency>

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

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

  <name>ebean api</name>
@@ -86,23 +86,6 @@
      <optional>true</optional>
    </dependency>

-    <!-- JAVAX-DEPENDENCY-START ___
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <version>3.1.0</version>
-      <optional>true</optional>
-    </dependency>
-    ____ JAVAX-DEPENDENCY-END -->
-    <!-- JAKARTA-DEPENDENCY-START -->
-    <dependency>
-      <groupId>jakarta.servlet</groupId>
-      <artifactId>jakarta.servlet-api</artifactId>
-      <version>6.0.0</version>
-      <optional>true</optional>
-    </dependency>
-    <!-- JAKARTA-DEPENDENCY-END -->
-
  </dependencies>

  <build>
@@ -605,7 +605,7 @@ public final class DB {
   *   // find orders and their customers
   *   List<Order> list = DB.find(Order.class)
   *     .fetch("customer")
-   *     .order("id")
+   *     .orderBy("id")
   *     .findList();
   *
   *   // sort by customer name ascending, then by order shipDate
@@ -400,7 +400,7 @@ public interface Database {
   *   // find orders and their customers
   *   List<Order> list = database.find(Order.class)
   *     .fetch("customer")
-   *     .order("id")
+   *     .orderBy("id")
   *     .findList();
   *
   *   // sort by customer name ascending, then by order shipDate
@@ -772,18 +772,6 @@ public interface Database {
   */
  <T> T reference(Class<T> beanType, Object id);

-  /**
-   * Return the extended API for Database.
-   * <p>
-   * The extended API has the options for executing queries that take an explicit
-   * transaction as an argument.
-   * <p>
-   * Typically, we only need to use the extended API when we do NOT want to use the
-   * usual ThreadLocal based mechanism to obtain the current transaction but instead
-   * supply the transaction explicitly.
-   */
-  ExtendedServer extended();
-
  /**
   * Either Insert or Update the bean depending on its state.
   * <p>
@@ -1968,8 +1968,8 @@ public interface DatabaseBuilder {
  DatabaseBuilder setLocalOnlyL2Cache(boolean localOnlyL2Cache);

  /**
-   * Controls if Ebean should ignore <code>&x64;javax.validation.contstraints.NotNull</code> or
-   * <code>&x64;jakarta.validation.contstraints.NotNull</code>
+   * Controls if Ebean should ignore <code>&#64;javax.validation.contstraints.NotNull</code> or
+   * <code>&#64;jakarta.validation.contstraints.NotNull</code>
   * with respect to generating a <code>NOT NULL</code> column.
   * <p>
   * Normally when Ebean sees javax NotNull annotation it means that column is defined as NOT NULL.
@@ -53,14 +53,6 @@ public interface ExpressionList<T> {
   */
  Query<T> orderById(boolean orderById);

-  /**
-   * @deprecated migrate to {@link #orderBy(String)}
-   */
-  @Deprecated(since = "13.19", forRemoval = true)
-  default ExpressionList<T> order(String orderByClause) {
-    return orderBy(orderByClause);
-  }
-
  /**
   * Set the order by clause replacing the existing order by clause if there is
   * one.
@@ -71,14 +63,6 @@ public interface ExpressionList<T> {
   */
  ExpressionList<T> orderBy(String orderBy);

-  /**
-   * @deprecated migrate to {@link #orderBy()}.
-   */
-  @Deprecated(forRemoval = true)
-  default OrderBy<T> order() {
-    return orderBy();
-  }
-
  /**
   * Return the OrderBy so that you can append an ascending or descending
   * property to the order by clause.
@@ -221,21 +205,6 @@ public interface ExpressionList<T> {
   */
  int delete();

-  /**
-   * @deprecated migrate to {@link #usingTransaction(Transaction)} then delete().
-   * <p>
-   * Execute as a delete query deleting the 'root level' beans that match the predicates
-   * in the query.
-   * <p>
-   * Note that if the query includes joins then the generated delete statement may not be
-   * optimal depending on the database platform.
-   * </p>
-   *
-   * @return the number of rows that were deleted.
-   */
-  @Deprecated(forRemoval = true, since = "13.1.0")
-  int delete(Transaction transaction);
-
  /**
   * Execute as a update query.
   *
@@ -244,17 +213,6 @@ public interface ExpressionList<T> {
   */
  int update();

-  /**
-   * @deprecated migrate to {@link #usingTransaction(Transaction)} then update().
-   * <p>
-   * Execute as a update query with the given transaction.
-   *
-   * @return the number of rows that were updated.
-   * @see UpdateQuery
-   */
-  @Deprecated(forRemoval = true, since = "13.1.0")
-  int update(Transaction transaction);
-
  /**
   * Execute the query returning true if a row is found.
   * <p>
@@ -355,7 +313,7 @@ public interface ExpressionList<T> {
   *  List<String> names =
   *    DB.find(Customer.class)
   *      .select("name")
-   *      .order().asc("name")
+   *      .orderBy().asc("name")
   *      .findSingleAttributeList();
   *
   * }</pre>
@@ -368,7 +326,7 @@ public interface ExpressionList<T> {
   *      .setDistinct(true)
   *      .select("name")
   *      .where().eq("status", Customer.Status.NEW)
-   *      .order().asc("name")
+   *      .orderBy().asc("name")
   *      .setMaxRows(100)
   *      .findSingleAttributeList();
   *
@@ -1713,7 +1671,7 @@ public interface ExpressionList<T> {
   *        .eq("status", Customer.Status.ACTIVE)
   *        .gt("id", 0)
   *        .endAnd()
-   *      .order().asc("name")
+   *      .orderBy().asc("name")
   *      .findList();
   * }</pre>
   */
@@ -1734,7 +1692,7 @@ public interface ExpressionList<T> {
   *    .or()
   *      .eq("status", Customer.Status.ACTIVE)
   *      .isNull("anniversary")
-   *    .order().asc("name")
+   *    .orderBy().asc("name")
   *    .findList();
   *
   * }</pre>
@@ -1754,7 +1712,7 @@ public interface ExpressionList<T> {
   *        .eq("status", Customer.Status.ACTIVE)
   *        .gt("id", 0)
   *        .endAnd()
-   *      .order().asc("name")
+   *      .orderBy().asc("name")
   *      .findList();
   *
   * }</pre>
@@ -1788,7 +1746,7 @@ public interface ExpressionList<T> {
   *       .gt("id", 1)
   *       .eq("anniversary", onAfter)
   *       .endNot()
-   *     .order()
+   *     .orderBy()
   *       .asc("name")
   *     .findList();
   *
@@ -1,21 +0,0 @@
-package io.ebean;
-
-import java.time.Clock;
-
-/**
- * The extended API for Database.
- */
-public interface ExtendedServer {
-
-  /**
-   * Deprecated but no yet determined suitable replacement (to support testing only change of clock).
-   * <p>
-   * Set the Clock to use for <code>@WhenCreated</code> and <code>@WhenModified</code>.
-   * <p>
-   * Note that we only expect to change the Clock for testing purposes.
-   * </p>
-   */
-  @Deprecated
-  void setClock(Clock clock);
-
-}
@@ -35,7 +35,7 @@ import java.util.List;
 *   public List<Customer> findNew() {
 *     return query().where()
 *       .eq("status", Customer.Status.NEW)
- *       .order("name")
+ *       .orderBy("name")
 *       .findList()
 *   }
 * }
@@ -61,7 +61,7 @@ package io.ebean;
 *            .eq("status", Customer.Status.ACTIVE)
 *            .gt("id", 0)
 *            .endAnd()
- *      .order().asc("name");
+ *      .orderBy().asc("name");
 *
 * q.findList();
 * String s = q.getGeneratedSql();
@@ -25,7 +25,7 @@ import java.util.concurrent.Future;
 *
 *     PagedList<Order> pagedList = DB.find(Order.class)
 *       .where().eq("status", Order.Status.NEW)
- *       .order().asc("id")
+ *       .orderBy().asc("id")
 *       .setFirstRow(0)
 *       .setMaxRows(50)
 *       .findPagedList();
@@ -30,7 +30,7 @@ import java.util.Objects;
 *   .where()
 *   .eq("store", "def")
 *   .inPairs(pairs)       // IN clause with 'pairs' of values
- *   .order("sku desc")
+ *   .orderBy("sku desc")
 *
 *   // query expressions cover the natural key properties
 *   // so we can choose to hit the L2 bean cache if we want
@@ -13,7 +13,7 @@ import org.jspecify.annotations.NullMarked;
 *     .where()
 *       .like("customer.name","rob%")
 *       .gt("orderDate",lastWeek)
- *     .order("customer.id, id desc")
+ *     .orderBy("customer.id, id desc")
 *     .setMaxRows(50)
 *     .findList();
 *
@@ -218,29 +218,6 @@ public interface Query<T> extends CancelableQuery, QueryBuilder<Query<T>, T> {
   */
  boolean isCountDistinct();

-  /**
-   * @deprecated migrate to {@link #usingTransaction(Transaction)} then delete().
-   * <p>
-   * Execute as a delete query returning the number of rows deleted using the given transaction.
-   * <p>
-   * Note that if the query includes joins then the generated delete statement may not be
-   * optimal depending on the database platform.
-   *
-   * @return the number of beans/rows that were deleted.
-   */
-  @Deprecated(forRemoval = true, since = "14.1.0")
-  int delete(Transaction transaction);
-
-  /**
-   * @deprecated migrate to {@link #usingTransaction(Transaction)} then update().
-   * <p>
-   * Execute the UpdateQuery returning the number of rows updated using the given transaction.
-   *
-   * @return the number of beans/rows updated.
-   */
-  @Deprecated(forRemoval = true, since = "14.1.0")
-  int update(Transaction transaction);
-
  /**
   * Execute the UpdateQuery returning the number of rows updated.
   *
@@ -440,30 +417,6 @@ public interface Query<T> extends CancelableQuery, QueryBuilder<Query<T>, T> {
   */
  Query<T> having(Expression addExpressionToHaving);

-  /**
-   * @deprecated migrate to {@link #orderBy()}.
-   */
-  @Deprecated(since = "13.19", forRemoval = true)
-  default Query<T> order(String orderByClause) {
-    return orderBy(orderByClause);
-  }
-
-  /**
-   * @deprecated migrate to {@link #orderBy()}.
-   */
-  @Deprecated(since = "13.19", forRemoval = true)
-  default OrderBy<T> order() {
-    return orderBy();
-  }
-
-  /**
-   * @deprecated migrate to {@link #setOrderBy(OrderBy)}.
-   */
-  @Deprecated(since = "13.19", forRemoval = true)
-  default Query<T> setOrder(OrderBy<T> orderBy) {
-    return setOrderBy(orderBy);
-  }
-
  /**
   * Return the OrderBy so that you can append an ascending or descending
   * property to the order by clause.
@@ -25,7 +25,7 @@ import java.util.Iterator;
 *
 *  Query<Customer> query = database.find(Customer.class)
 *     .where().gt("id", 0)
- *     .order("id")
+ *     .orderBy("id")
 *     .setMaxRows(2);
 *
 *  QueryIterator<Customer> it = query.findIterate();
@@ -111,7 +111,7 @@ package io.ebean;
 *     .fetch("order.customer", "name")
 *     .where().gt("order.id", 0)
 *     .having().gt("totalAmount", 20)
- *     .order().desc("totalAmount")
+ *     .orderBy().desc("totalAmount")
 *     .setMaxRows(10)
 *     .findList();
 *
@@ -1,5 +1,7 @@
 package io.ebean.config;

+import io.ebean.plugin.Lookups;
+
 /**
 * Helper to find classes taking into account the context class loader.
 */
@@ -73,9 +75,8 @@ public class ClassLoadConfig {
   */
  public Object newInstance(String className) {
    try {
-      Class<?> cls = forName(className);
-      return cls.getDeclaredConstructor().newInstance();
-    } catch (Exception e) {
+      return Lookups.newDefaultInstance(forName(className));
+    } catch (Throwable e) {
      throw new IllegalArgumentException("Error constructing " + className, e);
    }
  }
@@ -0,0 +1,15 @@
+package io.ebean.config;
+
+import java.lang.invoke.MethodHandles.Lookup;
+
+/**
+ * Provides a Lookup instance for accessing entity/dto fields.
+ */
+public interface LookupProvider {
+
+  /**
+   * Return the Lookup.
+   */
+  Lookup provideLookup();
+
+}
@@ -172,7 +172,6 @@ public class DbPlatformType implements ExtraDbTypes {
   * </p>
   */
  public String renderType(int deployLength, int deployScale, boolean strict) {
-
    int len = deployLength != 0 ? deployLength : defaultLength;
    if (len > maxLength) {
      return fallback.renderType(deployLength, deployScale, strict);
@@ -182,7 +181,6 @@ public class DbPlatformType implements ExtraDbTypes {
      if ((canHaveLength || !strict) && len > 0) {
        renderLengthScale(len, deployScale, sb);
      }
-
      return sb.toString();
    }
  }
@@ -157,7 +157,7 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator {
      if (newIds.isEmpty()) {
        throw new PersistenceException("Always expecting more than 1 row from " + sql);
      }
-
+      connection.commit();
      return newIds;

    } catch (SQLException e) {
@@ -1,5 +1,6 @@
 package io.ebean.event;

+import io.ebean.plugin.Lookups;

 /**
 * Helper to find classes taking into account the context class loader.
@@ -12,8 +13,8 @@ class ClassUtil {
  static Object newInstance(String className) {
    try {
      Class<?> cls = forName(className);
-      return cls.getDeclaredConstructor().newInstance();
-    } catch (Exception e) {
+      return Lookups.newDefaultInstance(cls);
+    } catch (Throwable e) {
      String msg = "Error constructing " + className;
      throw new IllegalArgumentException(msg, e);
    }
@@ -1,40 +0,0 @@
-package io.ebean.event;
-
-import jakarta.servlet.ServletContextEvent;
-
-/**
- * Deprecated for removal - no intention to replace. Create your own copy of this
- * ServletContextListener if needed for your application.
- * <p>
- * Listens for webserver server starting and stopping events.
- * <p>
- * This should be used when the deployment is into a servlet container where the webapp
- * can be shutdown or redeployed without the JVM stopping.
- * </p>
- * <p>
- * If deployment is into a container where the JVM is completely shutdown (like spring boot,
- * runnable war or when using a servlet container that only contains the single webapp and
- * the JVM is shutdown then this isn't required. Instead we can just rely on the JVM shutdown
- * hook that Ebean registers.
- * </p>
- */
-@Deprecated(forRemoval = true)
-public class ServletContextListener implements jakarta.servlet.ServletContextListener {
-
-  /**
-   * The servlet container is stopping.
-   */
-  @Override
-  public void contextDestroyed(ServletContextEvent event) {
-    ShutdownManager.shutdown();
-  }
-
-  /**
-   * Do nothing on startup.
-   */
-  @Override
-  public void contextInitialized(ServletContextEvent event) {
-
-  }
-
-}
@@ -0,0 +1,43 @@
+package io.ebean.plugin;
+
+import io.ebean.DB;
+import io.ebean.TxScope;
+
+/**
+ * Helper object to make AOP generated code simpler.
+ */
+public final class AOPTransactionScope {
+  private static boolean enabled = true;
+
+  /**
+   * Entering an enhanced transactional method.
+   */
+  public static void enter(TxScope txScope) {
+    if (enabled) {
+      server().scopedTransactionEnter(txScope);
+    }
+  }
+
+  /**
+   * Exiting an enhanced transactional method.
+   */
+  public static void exit(Object returnOrThrowable, int opCode) {
+    if (enabled) {
+      server().scopedTransactionExit(returnOrThrowable, opCode);
+    }
+  }
+
+  private static SpiServer server() {
+    return (SpiServer) DB.getDefault();
+  }
+
+  /**
+   * Defines if the @Transactional does what is supposed to do or is disabled
+   * (useful only unit testing)
+   *
+   * @param enabled if set to false, @Transactional will not create a transaction
+   */
+  public static void setEnabled(boolean enabled) {
+    AOPTransactionScope.enabled = enabled;
+  }
+}
@@ -0,0 +1,41 @@
+package io.ebean.plugin;
+
+import static java.util.stream.Collectors.toMap;
+
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodHandles.Lookup;
+import java.lang.invoke.MethodType;
+import java.util.Map;
+import java.util.ServiceLoader;
+
+import io.ebean.config.LookupProvider;
+
+/**
+ * Provides Lookup instances using potentially module specific Lookups.
+ */
+public final class Lookups {
+
+  private static final Map<String, Lookup> LOOKUP_MAP =
+      ServiceLoader.load(LookupProvider.class).stream()
+          .collect(toMap(p -> p.type().getModule().getName(), p -> p.get().provideLookup()));
+
+  private static final Lookup DEFAULT_LOOKUP = MethodHandles.publicLookup();
+
+  private static final MethodType VOID = MethodType.methodType(void.class);
+
+  /**
+   * Return a Lookup ideally for the module associated with the given type.
+   */
+  public static Lookup getLookup(Class<?> type) {
+    return LOOKUP_MAP.getOrDefault(type.getModule().getName(), DEFAULT_LOOKUP);
+  }
+
+  /**
+   * Find the default constructor and return a new instance for the given type
+   * potentially using a module specific Lookup instance.
+   */
+  @SuppressWarnings("unchecked")
+  public static <T> T newDefaultInstance(Class<?> type) throws Throwable {
+    return (T) getLookup(type).findConstructor(type, VOID).invoke();
+  }
+}
@@ -1,6 +1,7 @@
 package io.ebean.plugin;

 import io.ebean.Database;
+import io.ebean.TxScope;
 import io.ebean.bean.BeanLoader;
 import io.ebean.bean.EntityBeanIntercept;
 import io.ebean.DatabaseBuilder;
@@ -63,4 +64,15 @@ public interface SpiServer extends Database {
   * Typically due to serialisation or multiple stateless updates.
   */
  void loadBean(EntityBeanIntercept ebi);
+
+  /**
+   * Start an enhanced transactional method.
+   */
+  void scopedTransactionEnter(TxScope txScope);
+
+  /**
+   * Handle the end of an enhanced Transactional method.
+   */
+  void scopedTransactionExit(Object returnOrThrowable, int opCode);
+
 }
@@ -15,7 +15,7 @@
 *     .fetch("billingAddress","line1, city")
 *     .fetch("billingAddress.country", "*")
 *     .fetch("contacts", "firstName,email")
- *     .order().desc("id")
+ *     .orderBy().desc("id")
 *     .findList();
 *
 * JsonContext json = DB.json();
@@ -1,6 +1,7 @@
 module io.ebean.api {

  uses io.ebean.config.AutoConfigure;
+  uses io.ebean.config.LookupProvider;
  uses io.ebean.datasource.DataSourceAlertFactory;
  uses io.ebean.service.BootstrapService;
  uses io.ebean.service.SpiJsonService;
@@ -17,20 +18,19 @@ module io.ebean.api {
  requires static io.ebean.types;
  requires static com.fasterxml.jackson.core;
  requires static com.fasterxml.jackson.databind;
-  requires static jakarta.servlet;

  exports io.ebean;
  exports io.ebean.bean;
  exports io.ebean.cache;
-  exports io.ebean.meta;
+  exports io.ebean.common;
  exports io.ebean.config;
  exports io.ebean.config.dbplatform;
+  exports io.ebean.docstore;
  exports io.ebean.event;
  exports io.ebean.event.readaudit;
  exports io.ebean.event.changelog;
-  exports io.ebean.common;
-  exports io.ebean.docstore;
  exports io.ebean.plugin;
+  exports io.ebean.meta;
  exports io.ebean.metric;
  exports io.ebean.search;
  exports io.ebean.service;
@@ -1 +1 @@
-ebean-version: 148
+ebean-version: 149
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.8.0</version>
+    <version>14.10.0</version>
  </parent>

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

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-api</artifactId>
-        <version>14.8.0</version>
+        <version>14.10.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-core</artifactId>
-        <version>14.8.0</version>
+        <version>14.10.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-core-type</artifactId>
-        <version>14.8.0</version>
+        <version>14.10.0</version>
      </dependency>

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

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-ddl-generator</artifactId>
-        <version>14.8.0</version>
+        <version>14.10.0</version>
      </dependency>

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

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>querybean-generator</artifactId>
-        <version>14.8.0</version>
+        <version>14.10.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>kotlin-querybean-generator</artifactId>
-        <version>14.8.0</version>
+        <version>14.10.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-test</artifactId>
-        <version>14.8.0</version>
+        <version>14.10.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-redis</artifactId>
-        <version>14.8.0</version>
+        <version>14.10.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-spring-txn</artifactId>
-        <version>14.8.0</version>
+        <version>14.10.0</version>
      </dependency>

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

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-db2</artifactId>
-        <version>14.8.0</version>
+        <version>14.10.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-h2</artifactId>
-        <version>14.8.0</version>
+        <version>14.10.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-hana</artifactId>
-        <version>14.8.0</version>
+        <version>14.10.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-mariadb</artifactId>
-        <version>14.8.0</version>
+        <version>14.10.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-mysql</artifactId>
-        <version>14.8.0</version>
+        <version>14.10.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-nuodb</artifactId>
-        <version>14.8.0</version>
+        <version>14.10.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-oracle</artifactId>
-        <version>14.8.0</version>
+        <version>14.10.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-postgres</artifactId>
-        <version>14.8.0</version>
+        <version>14.10.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-postgis</artifactId>
-        <version>14.8.0</version>
+        <version>14.10.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-postgis-types</artifactId>
-        <version>14.8.0</version>
+        <version>14.10.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-sqlite</artifactId>
-        <version>14.8.0</version>
+        <version>14.10.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-sqlserver</artifactId>
-        <version>14.8.0</version>
+        <version>14.10.0</version>
      </dependency>

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

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

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

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

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

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

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

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

@@ -235,26 +235,6 @@
        </configuration>
      </plugin>

-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-          <doctitle>Ebean 12</doctitle>
-          <overview>src/main/java/io/ebean/overview.html</overview>
-          <excludePackageNames>io.ebeaninternal.*:io.ebeanservice:io.ebean.common:io.ebean.bean:io.ebean.service:io.ebean.metric:io.ebean.util:io.ebean.config.properties:io.ebean.config.dbplatform</excludePackageNames>
-          <linksource>true</linksource>
-          <overview>src/main/java/com/avaje/ebean/overview.html</overview>
-        </configuration>
-        <executions>
-          <execution>
-            <id>attach-javadocs</id>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
    </plugins>

  </build>
@@ -1,34 +1,25 @@
 package io.ebeaninternal.api;

-import io.ebean.DB;
 import io.ebean.TxScope;
+import io.ebean.plugin.AOPTransactionScope;

 /**
 * Helper object to make AOP generated code simpler.
 */
 public final class HelpScopeTrans {
-  private static boolean enabled = true;

  /**
   * Entering an enhanced transactional method.
   */
  public static void enter(TxScope txScope) {
-    if (enabled) {
-      server().scopedTransactionEnter(txScope);
-    }
+    AOPTransactionScope.enter(txScope);
  }

  /**
   * Exiting an enhanced transactional method.
   */
  public static void exit(Object returnOrThrowable, int opCode) {
-    if (enabled) {
-      server().scopedTransactionExit(returnOrThrowable, opCode);
-    }
-  }
-
-  private static SpiEbeanServer server() {
-    return (SpiEbeanServer) DB.getDefault();
+    AOPTransactionScope.exit(returnOrThrowable, opCode);
  }

  /**
@@ -38,6 +29,6 @@ public final class HelpScopeTrans {
   * @param enabled if set to false, @Transactional will not create a transaction
   */
  public static void setEnabled(boolean enabled) {
-    HelpScopeTrans.enabled = enabled;
+    AOPTransactionScope.setEnabled(enabled);
  }
 }
@@ -34,8 +34,8 @@ public final class ScopeTrans {
   * Explicit set of Exceptions that DO cause a rollback to occur.
   */
  private final ArrayList<Class<? extends Throwable>> rollbackFor;
-  private Boolean restoreBatch;
-  private Boolean restoreBatchOnCascade;
+  private boolean restoreBatch;
+  private boolean restoreBatchOnCascade;
  private int restoreBatchSize;
  private Boolean restoreBatchGeneratedKeys;
  private boolean restoreBatchFlushOnQuery;
@@ -61,7 +61,7 @@ public final class ScopeTrans {
    this.noRollbackFor = txScope.getNoRollbackFor();
    this.rollbackFor = txScope.getRollbackFor();
    if (transaction != null) {
-      if (!created && txScope.isBatchSet() || txScope.isBatchOnCascadeSet() || txScope.isBatchSizeSet()) {
+      if (!created) {
        restoreBatch = transaction.isBatchMode();
        restoreBatchOnCascade = transaction.isBatchOnCascade();
        restoreBatchSize = transaction.getBatchSize();
@@ -142,16 +142,12 @@ public final class ScopeTrans {
      transaction.commit();
    } else {
      nestedCommit = true;
+      transaction.flush();
+      // restore the batch settings
      transaction.setFlushOnQuery(restoreBatchFlushOnQuery);
-      if (restoreBatch != null) {
-        transaction.setBatchMode(restoreBatch);
-      }
-      if (restoreBatchOnCascade != null) {
-        transaction.setBatchOnCascade(restoreBatchOnCascade);
-      }
-      if (restoreBatchSize > 0) {
-        transaction.setBatchSize(restoreBatchSize);
-      }
+      transaction.setBatchMode(restoreBatch);
+      transaction.setBatchOnCascade(restoreBatchOnCascade);
+      transaction.setBatchSize(restoreBatchSize);
      if (restoreBatchGeneratedKeys != null) {
        transaction.setGetGeneratedKeys(restoreBatchGeneratedKeys);
      }
@@ -168,7 +168,7 @@ public final class ScopedTransaction extends SpiTransactionProxy {
  /**
   * Maybe rollback based on TxScope rollback on settings.
   */
-  public Exception caughtThrowable(Exception e) {
+  public <T extends Exception> T caughtThrowable(T e) {
    return current.caughtThrowable(e);
  }

@@ -26,7 +26,7 @@ import java.util.stream.Stream;
 /**
 * Service Provider extension to EbeanServer.
 */
-public interface SpiEbeanServer extends SpiServer, ExtendedServer, BeanCollectionLoader {
+public interface SpiEbeanServer extends SpiServer, BeanCollectionLoader {

  /**
   * Return the NOW time from the Clock.
@@ -216,16 +216,6 @@ public interface SpiEbeanServer extends SpiServer, ExtendedServer, BeanCollectio
   */
  void slowQueryCheck(long executionTimeMicros, int rowCount, SpiQuery<?> query);

-  /**
-   * Start an enhanced transactional method.
-   */
-  void scopedTransactionEnter(TxScope txScope);
-
-  /**
-   * Handle the end of an enhanced Transactional method.
-   */
-  void scopedTransactionExit(Object returnOrThrowable, int opCode);
-
  /**
   * SqlQuery find single attribute.
   */
@@ -53,4 +53,9 @@ public interface SpiSqlBinding extends SpiCancelableQuery {
   */
  int getBufferFetchSizeHint();

+  /**
+   * Set the JDBC fetchSize buffer hint if not explicitly set.
+   */
+  void setDefaultFetchBuffer(int fetchSize);
+
 }
@@ -92,6 +92,12 @@ public abstract class AbstractSqlQueryRequest implements CancelableQuery {

  protected abstract void requestComplete();

+  /**
+   * Set the JDBC buffer fetchSize hint if not set explicitly.
+   */
+  public void setDefaultFetchBuffer(int fetchSize) {
+    query.setDefaultFetchBuffer(fetchSize);
+  }
  /**
   * Close the underlying resources.
   */
@@ -1,29 +0,0 @@
-package io.ebeaninternal.server.core;
-
-import java.time.Clock;
-
-/**
- * Wraps the Clock such that we can change the Clock for testing purposes.
- */
-public class ClockService {
-
-  private Clock clock;
-
-  public ClockService(Clock clock) {
-    this.clock = clock;
-  }
-
-  /**
-   * Change the clock for testing purposes.
-   */
-  public void setClock(Clock clock) {
-    this.clock = clock;
-  }
-
-  /**
-   * Return the Clock current timestamp in millis.
-   */
-  public long nowMillis() {
-    return clock.millis();
-  }
-}
@@ -77,7 +77,12 @@ public class DatabasePlatformFactory {
   */
  private DatabasePlatform byDataSource(DataSource dataSource) {
    try (Connection connection = dataSource.getConnection()) {
-      return byDatabaseMeta(connection.getMetaData(), connection);
+      DatabasePlatform platform = byDatabaseMeta(connection.getMetaData(), connection);
+      if (!connection.getAutoCommit()) {
+        // we must roll back before close.
+        connection.rollback();
+      }
+      return platform;
    } catch (SQLException ex) {
      throw new PersistenceException(ex);
    }
@@ -262,6 +262,8 @@ public final class DefaultContainer implements SpiContainer {
    try (Connection connection = config.getDataSource().getConnection()) {
      if (connection.getAutoCommit()) {
        log.log(WARNING, "DataSource [{0}] has autoCommit defaulting to true!", config.getName());
+      } else {
+        connection.rollback();
      }
      return true;
    } catch (SQLException ex) {
@@ -83,7 +83,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
  private final QueryPlanManager queryPlanManager;
  private final ExtraMetrics extraMetrics;
  private final DataTimeZone dataTimeZone;
-  private final ClockService clockService;
+  private final Clock clock;
  private final CallOriginFactory callStackFactory;
  private final Persister persister;
  private final OrmQueryEngine queryEngine;
@@ -151,7 +151,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    this.beanLoader = new DefaultBeanLoader(this);
    this.jsonContext = config.createJsonContext(this);
    this.dataTimeZone = config.getDataTimeZone();
-    this.clockService = config.getClockService();
+    this.clock = config.clock();

    DocStoreIntegration docStoreComponents = config.createDocStoreIntegration(this);
    this.transactionManager = config.createTransactionManager(this, docStoreComponents.updateProcessor());
@@ -413,19 +413,9 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    return serverName;
  }

-  @Override
-  public ExtendedServer extended() {
-    return this;
-  }
-
  @Override
  public long clockNow() {
-    return clockService.nowMillis();
-  }
-
-  @Override
-  public void setClock(Clock clock) {
-    this.clockService.setClock(clock);
+    return clock.millis();
  }

  @Override
@@ -680,6 +670,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
      return callable.call();
    } catch (Error e) {
      throw scopeTrans.caughtError(e);
+    } catch (PersistenceException e) {
+      throw scopeTrans.caughtThrowable(e);
    } catch (Exception e) {
      throw new PersistenceException(scopeTrans.caughtThrowable(e));
    } finally {
@@ -699,6 +691,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
      runnable.run();
    } catch (Error e) {
      throw t.caughtError(e);
+    } catch (PersistenceException e) {
+      throw t.caughtThrowable(e);
    } catch (Exception e) {
      throw new PersistenceException(t.caughtThrowable(e));
    } finally {
@@ -55,6 +55,7 @@ import io.ebeanservice.docstore.api.DocStoreIntegration;
 import io.ebeanservice.docstore.api.DocStoreUpdateProcessor;
 import io.ebeanservice.docstore.none.NoneDocStoreFactory;

+import java.time.Clock;
 import java.util.*;

 import static java.lang.System.Logger.Level.*;
@@ -75,7 +76,7 @@ public final class InternalConfiguration {
  private final DeployInherit deployInherit;
  private final TypeManager typeManager;
  private final DtoBeanManager dtoBeanManager;
-  private final ClockService clockService;
+  private final Clock clock;
  private final DataTimeZone dataTimeZone;
  private final Binder binder;
  private final DeployCreateProperties deployCreateProperties;
@@ -103,7 +104,7 @@ public final class InternalConfiguration {
    this.online = online;
    this.config = config;
    this.jacksonCorePresent = config.getClassLoadConfig().isJacksonCorePresent();
-    this.clockService = new ClockService(config.settings().getClock());
+    this.clock = config.settings().getClock();
    this.tableModState = new TableModState();
    this.logManager = initLogManager();
    this.docStoreFactory = initDocStoreFactory(service(DocStoreFactory.class));
@@ -189,8 +190,8 @@ public final class InternalConfiguration {
    return docStoreFactory;
  }

-  ClockService getClockService() {
-    return clockService;
+  Clock clock() {
+    return clock;
  }

  public ExtraMetrics getExtraMetrics() {
@@ -300,11 +301,12 @@ public final class InternalConfiguration {
  }

  DtoQueryEngine createDtoQueryEngine() {
-    return new DtoQueryEngine(binder);
+    return new DtoQueryEngine(binder, config.getJdbcFetchSizeFindEach(), config.getJdbcFetchSizeFindList());
  }

  RelationalQueryEngine createRelationalQueryEngine() {
-    return new DefaultRelationalQueryEngine(binder, config.getDatabaseBooleanTrue(), config.getPlatformConfig().getDbUuid().useBinaryOptimized());
+    return new DefaultRelationalQueryEngine(binder, config.getDatabaseBooleanTrue(), config.getPlatformConfig().getDbUuid().useBinaryOptimized(),
+      config.getJdbcFetchSizeFindEach(), config.getJdbcFetchSizeFindList());
  }

  OrmQueryEngine createOrmQueryEngine() {
@@ -390,7 +392,7 @@ public final class InternalConfiguration {
    TransactionManagerOptions options =
      new TransactionManagerOptions(server, notifyL2CacheInForeground, config, scopeManager, clusterManager, backgroundExecutor,
        indexUpdateProcessor, beanDescriptorManager, dataSource(), profileHandler(), logManager,
-        tableModState, cacheNotify, clockService);
+        tableModState, cacheNotify);

    if (config.isDocStoreOnly()) {
      return new DocStoreTransactionManager(options);
@@ -11,14 +11,15 @@ import io.ebean.event.changelog.ChangeLogPrepare;
 import io.ebean.event.changelog.ChangeLogRegister;
 import io.ebean.event.readaudit.ReadAuditLogger;
 import io.ebean.event.readaudit.ReadAuditPrepare;
+import io.ebean.plugin.Lookups;
 import io.ebean.util.AnnotationUtil;
 import io.ebeaninternal.api.CoreLog;
-
 import jakarta.persistence.AttributeConverter;
 import jakarta.persistence.Embeddable;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Table;
 import java.lang.annotation.Annotation;
+import java.lang.invoke.MethodType;
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.List;
@@ -94,9 +95,9 @@ public class BootupClasses implements Predicate<Class<?>> {
  public void runServerConfigStartup(DatabaseBuilder config) {
    for (Class<?> cls : serverConfigStartupCandidates) {
      try {
-        ServerConfigStartup newInstance = (ServerConfigStartup) cls.getDeclaredConstructor().newInstance();
+        ServerConfigStartup newInstance = Lookups.newDefaultInstance(cls);
        newInstance.onStart(config);
-      } catch (Exception e) {
+      } catch (Throwable e) {
        // assume that the desired behavior is to fail - add your own try catch if needed
        throw new IllegalStateException("Error running ServerConfigStartup " + cls, e);
      }
@@ -206,12 +207,12 @@ public class BootupClasses implements Predicate<Class<?>> {
   */
  private <T> T create(Class<T> cls, boolean logOnException) {
    try {
-      return cls.getConstructor().newInstance();
+      return Lookups.newDefaultInstance(cls);
    } catch (NoSuchMethodException e) {
      log.log(DEBUG, "Ignore/expected - no default constructor: {0}", e.getMessage());
      return null;

-    } catch (Exception e) {
+    } catch (Throwable e) {
      if (logOnException) {
        // not expected but we log and carry on
        log.log(ERROR, "Error creating " + cls, e);
@@ -23,6 +23,7 @@ import io.ebean.meta.QueryPlanInit;
 import io.ebean.plugin.BeanDocType;
 import io.ebean.plugin.BeanType;
 import io.ebean.plugin.ExpressionPath;
+import io.ebean.plugin.Lookups;
 import io.ebean.plugin.Property;
 import io.ebean.util.SplitName;
 import io.ebeaninternal.api.*;
@@ -414,8 +415,8 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
      return null;
    }
    try {
-      return (EntityBean) beanType.getDeclaredConstructor().newInstance();
-    } catch (Exception e) {
+      return Lookups.newDefaultInstance(beanType);
+    } catch (Throwable e) {
      throw new IllegalStateException("Error trying to create the prototypeEntityBean for " + beanType, e);
    }
  }
@@ -3186,8 +3187,8 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
   * provides unique ordering of the rows (so that the paging is predicable).
   */
  public void appendOrderById(SpiQuery<T> query) {
-    if (idProperty != null && !idProperty.isEmbedded() && !query.order().containsProperty(idProperty.name())) {
-      query.order().asc(idProperty.name());
+    if (idProperty != null && !idProperty.isEmbedded() && !query.orderBy().containsProperty(idProperty.name())) {
+      query.orderBy().asc(idProperty.name());
    }
  }

@@ -3,6 +3,7 @@ package io.ebeaninternal.server.deploy;
 import io.ebean.PersistenceIOException;
 import io.ebean.SqlUpdate;
 import io.ebean.bean.EntityBean;
+import io.ebean.plugin.Lookups;
 import io.ebeaninternal.api.json.SpiJsonReader;
 import io.ebeaninternal.api.json.SpiJsonWriter;
 import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor;
@@ -22,8 +23,8 @@ class BeanDescriptorElementEmbedded<T> extends BeanDescriptorElement<T> {
  BeanDescriptorElementEmbedded(BeanDescriptorMap owner, DeployBeanDescriptor<T> deploy, ElementHelp elementHelp) {
    super(owner, deploy, elementHelp);
    try {
-      this.prototype = (EntityBean) beanType.getDeclaredConstructor().newInstance();
-    } catch (Exception e) {
+      this.prototype = Lookups.newDefaultInstance(beanType);
+    } catch (Throwable e) {
      throw new IllegalStateException("Unable to create entity bean prototype for "+beanType);
    }
    BeanPropertyAssocOne<?>[] embedded = propertiesEmbedded();
@@ -1002,11 +1002,8 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
    if (!(mappedProp instanceof DeployBeanPropertyAssocOne<?>)) {
      throw new PersistenceException("Error on " + prop + ". mappedBy property " + targetDesc + "." + mappedBy + " is not a OneToOne?");
    }
-    DeployBeanPropertyAssocOne<?> mappedAssocOne = (DeployBeanPropertyAssocOne<?>) mappedProp;
-    if (!mappedAssocOne.isOneToOne()) {
-      throw new PersistenceException("Error on " + prop + ". mappedBy property " + targetDesc + "." + mappedBy + " is not a OneToOne?");
-    }
-    return mappedAssocOne;
+    // this is allowed to be a OneToOne or ManyToOne
+    return (DeployBeanPropertyAssocOne<?>) mappedProp;
  }

  private void checkUniDirectionalPrimaryKeyJoin(DeployBeanPropertyAssocOne<?> prop) {
@@ -427,7 +427,9 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty implements STree
    BeanProperty[] others = target.propertiesBaseScalar();
    if (descriptor.isRawSqlBased()) {
      String dbColumn = owner.dbColumn();
-      return new ImportedIdSimple(owner, dbColumn, null, idProp, 0);
+      if (dbColumn != null) {
+        return new ImportedIdSimple(owner, dbColumn, null, idProp, 0);
+      }
    }
    if (idProp == null) {
      return null;
@@ -20,6 +20,7 @@ public final class TableJoinColumn {
  private final String foreignSqlFormula;
  private final boolean insertable;
  private final boolean updateable;
+  private final boolean nullable;
  /**
   * Hash for including in a query plan
   */
@@ -34,7 +35,8 @@ public final class TableJoinColumn {
    this.localSqlFormula = InternString.intern(deploy.getLocalSqlFormula());
    this.foreignSqlFormula = InternString.intern(deploy.getForeignSqlFormula());
    this.insertable = deploy.isInsertable();
-    this.updateable = deploy.isUpdateable();
+    this.updateable = deploy.isUpdatable();
+    this.nullable = deploy.isNullable();
    this.queryHash = hash();
  }

@@ -45,6 +47,7 @@ public final class TableJoinColumn {
    this.foreignSqlFormula = null;
    this.insertable = source.isInsertable();
    this.updateable = source.isUpdateable();
+    this.nullable = source.isNullable();
    this.queryHash = hash();
  }

@@ -115,6 +118,13 @@ public final class TableJoinColumn {
    return updateable;
  }

+  /**
+   * Return if this column is nullable.
+   */
+  public boolean isNullable() {
+    return nullable;
+  }
+
  public String getLocalSqlFormula() {
    return localSqlFormula;
  }
@@ -10,6 +10,7 @@ import io.ebean.config.dbplatform.IdType;
 import io.ebean.config.dbplatform.PlatformIdGenerator;
 import io.ebean.event.*;
 import io.ebean.event.changelog.ChangeLogFilter;
+import io.ebean.plugin.Lookups;
 import io.ebean.text.PathProperties;
 import io.ebean.util.SplitName;
 import io.ebeaninternal.api.ConcurrencyMode;
@@ -24,7 +25,7 @@ import io.ebeaninternal.server.rawsql.SpiRawSql;
 import jakarta.persistence.Entity;
 import jakarta.persistence.MappedSuperclass;

-import java.lang.reflect.Field;
+import java.lang.invoke.MethodHandles.Lookup;
 import java.util.*;

 /**
@@ -48,6 +49,7 @@ public class DeployBeanDescriptor<T> {

  private final DatabaseBuilder.Settings config;
  private final BeanDescriptorManager manager;
+
  /**
   * Map of BeanProperty Linked so as to preserve order.
   */
@@ -144,8 +146,8 @@ public class DeployBeanDescriptor<T> {

  private String[] readPropertyNames() {
    try {
-      Field field = beanType.getField("_ebean_props");
-      return (String[]) field.get(null);
+      final Lookup lookup = Lookups.getLookup(beanType);
+      return (String[]) lookup.findStaticVarHandle(beanType, "_ebean_props", String[].class).get();
    } catch (Exception e) {
      throw new IllegalStateException("Error getting _ebean_props field on type " + beanType, e);
    }
@@ -81,7 +81,7 @@ public final class DeployTableJoin {
      // only add the join column details when name or referencedColumnName is specified
      String ref = deploy.convertQuotes(jc.referencedColumnName());
      String nam = deploy.convertQuotes(jc.name());
-      addJoinColumn(new DeployTableJoinColumn(order, ref, nam, jc.insertable(), jc.updatable(), beanTable));
+      addJoinColumn(new DeployTableJoinColumn(order, ref, nam, jc.insertable(), jc.updatable(), jc.nullable(), beanTable));
    }
  }

@@ -25,7 +25,8 @@ public final class DeployTableJoinColumn {
   */
  private String foreignSqlFormula;
  private boolean insertable;
-  private boolean updateable;
+  private boolean updatable;
+  private boolean nullable;

  /**
   * Construct when automatically determining the join.
@@ -34,21 +35,24 @@ public final class DeployTableJoinColumn {
   * </p>
   */
  public DeployTableJoinColumn(String localDbColumn, String foreignDbColumn) {
-    this(localDbColumn, foreignDbColumn, true, true);
+    this(localDbColumn, foreignDbColumn, true, true, true);
  }

  /**
   * Construct with explicit insertable and updateable flags.
   */
-  public DeployTableJoinColumn(String localDbColumn, String foreignDbColumn, boolean insertable, boolean updateable) {
+  public DeployTableJoinColumn(String localDbColumn, String foreignDbColumn,
+                               boolean insertable, boolean updatable, boolean nullable) {
    this.localDbColumn = nullEmptyString(localDbColumn);
    this.foreignDbColumn = nullEmptyString(foreignDbColumn);
    this.insertable = insertable;
-    this.updateable = updateable;
+    this.updatable = updatable;
+    this.nullable = nullable;
  }

-  public DeployTableJoinColumn(boolean order, String ref, String name, boolean insertable, boolean updateable, BeanTable beanTable) {
-    this(ref, name, insertable, updateable);
+  public DeployTableJoinColumn(boolean order, String ref, String name,
+                               boolean insertable, boolean updatable, boolean nullable, BeanTable beanTable) {
+    this(ref, name, insertable, updatable, nullable);
    setReferencedColumn(beanTable);
    if (!order) {
      reverse();
@@ -60,7 +64,7 @@ public final class DeployTableJoinColumn {
      this.localSqlFormula = localSqlFormula;
      this.localDbColumn = null;
      this.insertable = false;
-      this.updateable = false;
+      this.updatable = false;
    }
  }

@@ -73,7 +77,7 @@ public final class DeployTableJoinColumn {
      this.foreignSqlFormula = foreignSqlFormula;
      this.foreignDbColumn = null;
      this.insertable = false;
-      this.updateable = false;
+      this.updatable = false;
    }
  }

@@ -121,12 +125,12 @@ public final class DeployTableJoinColumn {
    // but will leave it like this for now
    DeployTableJoinColumn ret;
    if (reverse) {
-      ret = new DeployTableJoinColumn(foreignDbColumn, localDbColumn, insertable, updateable);
+      ret = new DeployTableJoinColumn(foreignDbColumn, localDbColumn, insertable, updatable, nullable);
      ret.setLocalSqlFormula(foreignSqlFormula);
      ret.setForeignSqlFormula(localSqlFormula);

    } else {
-      ret = new DeployTableJoinColumn(localDbColumn, foreignDbColumn, insertable, updateable);
+      ret = new DeployTableJoinColumn(localDbColumn, foreignDbColumn, insertable, updatable, nullable);
      ret.setLocalSqlFormula(localSqlFormula);
      ret.setForeignSqlFormula(foreignSqlFormula);
    }
@@ -148,8 +152,8 @@ public final class DeployTableJoinColumn {
  /**
   * Return true if this column should be updateable.
   */
-  public boolean isUpdateable() {
-    return updateable;
+  public boolean isUpdatable() {
+    return updatable;
  }

  /**
@@ -173,4 +177,7 @@ public final class DeployTableJoinColumn {
    this.localDbColumn = localDbColumn;
  }

+  public boolean isNullable() {
+    return nullable;
+  }
 }
@@ -223,7 +223,7 @@ final class AnnotationAssocOnes extends AnnotationAssoc {
    BeanTable baseBeanTable = factory.beanTable(info.getDescriptor().getBeanType());
    String localPrimaryKey = baseBeanTable.getIdColumn();
    String foreignColumn = getBeanTable(prop).getIdColumn();
-    prop.getTableJoin().addJoinColumn(new DeployTableJoinColumn(localPrimaryKey, foreignColumn, false, false));
+    prop.getTableJoin().addJoinColumn(new DeployTableJoinColumn(localPrimaryKey, foreignColumn, false, false, prop.isNullable()));
  }

  private void readEmbedded(DeployBeanPropertyAssocOne<?> prop, Embedded embedded) {
@@ -1,20 +1,19 @@
 package io.ebeaninternal.server.dto;

-import io.ebean.core.type.DataReader;
-import io.ebean.core.type.ScalarType;
-import io.ebeaninternal.server.type.TypeManager;
-
 import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import java.lang.reflect.Constructor;
 import java.sql.SQLException;

+import io.ebean.core.type.DataReader;
+import io.ebean.core.type.ScalarType;
+import io.ebean.plugin.Lookups;
+import io.ebeaninternal.server.type.TypeManager;
+
 final class DtoMetaConstructor {

  private final Class<?>[] types;
  private final MethodHandle handle;
-  private static final MethodHandles.Lookup LOOKUP = MethodHandles.lookup();
  private final ScalarType<?>[] scalarTypes;

  DtoMetaConstructor(TypeManager typeManager, Constructor<?> constructor, Class<?> someClass) throws NoSuchMethodException, IllegalAccessException {
@@ -23,7 +22,7 @@ final class DtoMetaConstructor {
    for (int i = 0; i < types.length; i++) {
      scalarTypes[i] = typeManager.type(types[i]);
    }
-    this.handle = LOOKUP.findConstructor(someClass, typeFor(types));
+    this.handle = Lookups.getLookup(someClass).findConstructor(someClass, typeFor(types));
  }

  private MethodType typeFor(Class<?>[] types) {
@@ -1,19 +1,17 @@
 package io.ebeaninternal.server.dto;

-import io.ebean.core.type.DataReader;
-import io.ebean.core.type.ScalarType;
-import io.ebeaninternal.server.type.TypeManager;
-
 import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 import java.sql.SQLException;

-final class DtoMetaProperty implements DtoReadSet {
+import io.ebean.core.type.DataReader;
+import io.ebean.core.type.ScalarType;
+import io.ebean.plugin.Lookups;
+import io.ebeaninternal.server.type.TypeManager;

-  private static final MethodHandles.Lookup LOOKUP = MethodHandles.lookup();
+final class DtoMetaProperty implements DtoReadSet {

  private final Class<?> dtoType;
  private final String name;
@@ -33,7 +31,7 @@ final class DtoMetaProperty implements DtoReadSet {
  }

  private static MethodHandle lookupMethodHandle(Class<?> dtoType, Method method) throws NoSuchMethodException, IllegalAccessException {
-    return LOOKUP.findVirtual(dtoType, method.getName(), MethodType.methodType(method.getReturnType(), method.getParameterTypes()));
+    return Lookups.getLookup(dtoType).findVirtual(dtoType, method.getName(), MethodType.methodType(method.getReturnType(), method.getParameterTypes()));
  }

  static Type propertyType(Method method) {
@@ -332,21 +332,11 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
    return query.delete();
  }

-  @Override
-  public int delete(Transaction transaction) {
-    return query.delete(transaction);
-  }
-
  @Override
  public int update() {
    return query.update();
  }

-  @Override
-  public int update(Transaction transaction) {
-    return query.update(transaction);
-  }
-
  @Override
  public FutureIds<T> findFutureIds() {
    return query.findFutureIds();
@@ -172,7 +172,7 @@ public final class FilterExpressionList<T> extends DefaultExpressionList<T> {
      query.setMaxRows(maxRows);
    }
    if (orderByClause != null) {
-      query.order(orderByClause);
+      query.orderBy(orderByClause);
    }
  }

@@ -337,21 +337,11 @@ final class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expr
    return exprList.delete();
  }

-  @Override
-  public int delete(Transaction transaction) {
-    return exprList.delete(transaction);
-  }
-
  @Override
  public int update() {
    return exprList.update();
  }

-  @Override
-  public int update(Transaction transaction) {
-    return exprList.update(transaction);
-  }
-
  @Override
  public Query<T> asOf(Timestamp asOf) {
    return exprList.asOf(asOf);
@@ -152,7 +152,7 @@ class EqlAdapter<T> extends EqlWhereListener<T> {
      }
    }

-    query.order().add(new OrderBy.Property(path, asc, nulls, nullsFirstLast));
+    query.orderBy().add(new OrderBy.Property(path, asc, nulls, nullsFirstLast));
  }

  @Override
@@ -233,17 +233,19 @@ final class CQueryBuilder {
  <T> CQueryRowCount buildRowCountQuery(OrmQueryRequest<T> request) {
    SpiQuery<T> query = request.query();
    // always set the order by to null for row count query
-    query.setOrder(null);
+    query.setOrderBy(null);
    query.setFirstRow(0);
    query.setMaxRows(0);

    boolean countDistinct = query.isDistinct();
+    boolean useColumnAlias = selectCountWithColumnAlias;
    boolean withAgg = false;
    if (!countDistinct) {
      withAgg = includesAggregation(request, query);
-      if (!withAgg) {
+      if (!withAgg && request.descriptor().hasId()) {
        // minimise select clause for standard count
        query.setSelectId();
+        useColumnAlias = false;
      }
    }

@@ -256,7 +258,7 @@ final class CQueryBuilder {
    }

    predicates.prepare(true);
-    SqlTree sqlTree = createSqlTree(request, predicates, selectCountWithColumnAlias && withAgg);
+    SqlTree sqlTree = createSqlTree(request, predicates, useColumnAlias);
    if (SpiQuery.TemporalMode.CURRENT == query.temporalMode()) {
      sqlTree.addSoftDeletePredicate(query);
    }
@@ -240,7 +240,7 @@ public final class CQueryEngine {
    }

    // order by lower sys period desc
-    query.order().desc(sysPeriodLower);
+    query.orderBy().desc(sysPeriodLower);
    CQuery<T> cquery = queryBuilder.buildQuery(request);
    request.setCancelableQuery(cquery);
    try {
@@ -63,6 +63,13 @@ public final class CQueryPlanManager implements QueryPlanManager {
      while (req.hasNext()) {
        req.nextCapture();
      }
+      if (!connection.getAutoCommit()) {
+        // CHECKME: commit or rollback here?
+        // arguments for rollback: the collecting should never modify data.
+        // if there are collectors that may copy the plan into tables, it's up to the collector to
+        // commit the transaction.
+        connection.rollback();
+      }
      return req.plans();
    } catch (SQLException e) {
      CoreLog.log.log(ERROR, "Error during query plan collection", e);
@@ -295,9 +295,8 @@ final class DefaultDbSqlContext implements DbSqlContext {
    if (useColumnAlias) {
      sb.append(' ');
      sb.append(columnAliasPrefix);
-      sb.append(columnIndex);
+      sb.append(columnIndex++);
    }
-    columnIndex++;
  }

  @Override
@@ -340,21 +340,11 @@ final class DefaultFetchGroupQuery<T> implements SpiFetchGroupQuery<T>, SpiQuery
    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
  }

-  @Override
-  public int delete(Transaction transaction) {
-    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
-  }
-
  @Override
  public int update() {
    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
  }

-  @Override
-  public int update(Transaction transaction) {
-    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
-  }
-
  @Override
  public int findCount() {
    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
@@ -29,12 +29,17 @@ public final class DefaultRelationalQueryEngine implements RelationalQueryEngine
  private final String dbTrueValue;
  private final boolean binaryOptimizedUUID;
  private final TimedMetricMap timedMetricMap;
+  private final int defaultFetchSizeFindEach;
+  private final int defaultFetchSizeFindList;

-  public DefaultRelationalQueryEngine(Binder binder, String dbTrueValue, boolean binaryOptimizedUUID) {
+  public DefaultRelationalQueryEngine(Binder binder, String dbTrueValue, boolean binaryOptimizedUUID,
+                                      int defaultFetchSizeFindEach, int defaultFetchSizeFindList) {
    this.binder = binder;
    this.dbTrueValue = dbTrueValue == null ? "true" : dbTrueValue;
    this.binaryOptimizedUUID = binaryOptimizedUUID;
    this.timedMetricMap = MetricFactory.get().createTimedMetricMap("sql.query.");
+    this.defaultFetchSizeFindEach = defaultFetchSizeFindEach;
+    this.defaultFetchSizeFindList = defaultFetchSizeFindList;
  }

  @Override
@@ -59,6 +64,9 @@ public final class DefaultRelationalQueryEngine implements RelationalQueryEngine
  @Override
  public void findEach(RelationalQueryRequest request, RowConsumer consumer) {
    try {
+      if (defaultFetchSizeFindEach > 0) {
+        request.setDefaultFetchBuffer(defaultFetchSizeFindEach);
+      }
      request.executeSql(binder, SpiQuery.Type.ITERATE);
      request.mapEach(consumer);
      request.logSummary();
@@ -74,6 +82,9 @@ public final class DefaultRelationalQueryEngine implements RelationalQueryEngine
  @Override
  public <T> void findEach(RelationalQueryRequest request, RowReader<T> reader, Predicate<T> consumer) {
    try {
+      if (defaultFetchSizeFindEach > 0) {
+        request.setDefaultFetchBuffer(defaultFetchSizeFindEach);
+      }
      request.executeSql(binder, SpiQuery.Type.ITERATE);
      while (request.next()) {
        if (!consumer.test(reader.read())) {
@@ -109,6 +120,9 @@ public final class DefaultRelationalQueryEngine implements RelationalQueryEngine
  @Override
  public <T> List<T> findList(RelationalQueryRequest request, RowReader<T> reader) {
    try {
+      if (defaultFetchSizeFindList > 0) {
+        request.setDefaultFetchBuffer(defaultFetchSizeFindList);
+      }
      request.executeSql(binder, SpiQuery.Type.LIST);
      List<T> rows = new ArrayList<>();
      while (request.next()) {
@@ -129,6 +143,9 @@ public final class DefaultRelationalQueryEngine implements RelationalQueryEngine
  public <T> T findSingleAttribute(RelationalQueryRequest request, Class<T> cls) {
    ScalarType<T> scalarType = (ScalarType<T>) binder.getScalarType(cls);
    try {
+      if (defaultFetchSizeFindList > 0) {
+        request.setDefaultFetchBuffer(defaultFetchSizeFindList);
+      }
      request.executeSql(binder, SpiQuery.Type.ATTRIBUTE);
      final DataReader dataReader = binder.createDataReader(request.resultSet());
      T value = null;
@@ -151,6 +168,9 @@ public final class DefaultRelationalQueryEngine implements RelationalQueryEngine
  public <T> List<T> findSingleAttributeList(RelationalQueryRequest request, Class<T> cls) {
    ScalarType<T> scalarType = (ScalarType<T>) binder.getScalarType(cls);
    try {
+      if (defaultFetchSizeFindList > 0) {
+        request.setDefaultFetchBuffer(defaultFetchSizeFindList);
+      }
      request.executeSql(binder, SpiQuery.Type.ATTRIBUTE);
      final DataReader dataReader = binder.createDataReader(request.resultSet());
      List<T> rows = new ArrayList<>();
@@ -173,6 +193,9 @@ public final class DefaultRelationalQueryEngine implements RelationalQueryEngine
  public <T> void findSingleAttributeEach(RelationalQueryRequest request, Class<T> cls, Consumer<T> consumer) {
    ScalarType<T> scalarType = (ScalarType<T>) binder.getScalarType(cls);
    try {
+      if (defaultFetchSizeFindEach > 0) {
+        request.setDefaultFetchBuffer(defaultFetchSizeFindEach);
+      }
      request.executeSql(binder, SpiQuery.Type.ATTRIBUTE);
      final DataReader dataReader = binder.createDataReader(request.resultSet());
      while (dataReader.next()) {
@@ -4,8 +4,8 @@ import io.ebean.QueryIterator;
 import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.server.core.DtoQueryRequest;
 import io.ebeaninternal.server.persist.Binder;
-
 import jakarta.persistence.PersistenceException;
+
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
@@ -15,13 +15,20 @@ import java.util.function.Predicate;
 public final class DtoQueryEngine {

  private final Binder binder;
+  private final int defaultFetchSizeFindEach;
+  private final int defaultFetchSizeFindList;

-  public DtoQueryEngine(Binder binder) {
+  public DtoQueryEngine(Binder binder, int defaultFetchSizeFindEach, int defaultFetchSizeFindList) {
    this.binder = binder;
+    this.defaultFetchSizeFindEach = defaultFetchSizeFindEach;
+    this.defaultFetchSizeFindList = defaultFetchSizeFindList;
  }

  public <T> List<T> findList(DtoQueryRequest<T> request) {
    try {
+      if (defaultFetchSizeFindList > 0) {
+        request.setDefaultFetchBuffer(defaultFetchSizeFindList);
+      }
      request.executeSql(binder, SpiQuery.Type.LIST);
      List<T> rows = new ArrayList<>();
      while (request.next()) {
@@ -38,6 +45,9 @@ public final class DtoQueryEngine {

  public <T> QueryIterator<T> findIterate(DtoQueryRequest<T> request) {
    try {
+      if (defaultFetchSizeFindEach > 0) {
+        request.setDefaultFetchBuffer(defaultFetchSizeFindEach);
+      }
      request.executeSql(binder, SpiQuery.Type.ITERATE);
      return new DtoQueryIterator<>(request);
    } catch (SQLException e) {
@@ -46,7 +56,10 @@ public final class DtoQueryEngine {
  }

  public <T> void findEach(DtoQueryRequest<T> request, Consumer<T> consumer) {
-     try {
+    try {
+      if (defaultFetchSizeFindEach > 0) {
+        request.setDefaultFetchBuffer(defaultFetchSizeFindEach);
+      }
      request.executeSql(binder, SpiQuery.Type.ITERATE);
      while (request.next()) {
        consumer.accept(request.readNextBean());
@@ -61,6 +74,9 @@ public final class DtoQueryEngine {
  public <T> void findEach(DtoQueryRequest<T> request, int batchSize, Consumer<List<T>> consumer) {
    try {
      List<T> buffer = new ArrayList<>();
+      if (defaultFetchSizeFindEach > 0) {
+        request.setDefaultFetchBuffer(defaultFetchSizeFindEach);
+      }
      request.executeSql(binder, SpiQuery.Type.ITERATE);
      while (request.next()) {
        buffer.add(request.readNextBean());
@@ -82,6 +98,9 @@ public final class DtoQueryEngine {

  public <T> void findEachWhile(DtoQueryRequest<T> request, Predicate<T> consumer) {
    try {
+      if (defaultFetchSizeFindEach > 0) {
+        request.setDefaultFetchBuffer(defaultFetchSizeFindEach);
+      }
      request.executeSql(binder, SpiQuery.Type.ITERATE);
      while (request.next()) {
        if (!consumer.test(request.readNextBean())) {
@@ -47,7 +47,7 @@ public final class SqlTreeBuilder {
  private final boolean disableLazyLoad;
  private final boolean readOnly;
  private final SpiQuery.TemporalMode temporalMode;
-  private SqlTreeNode rootNode;
+  private final SqlTreeNode rootNode;
  private boolean sqlDistinct;
  private final boolean platformDistinctNoLobs;
  private final SqlTreeCommon common;
@@ -73,6 +73,7 @@ public final class SqlTreeBuilder {
    this.alias = null;
    this.ctx = null;
    this.common = new SqlTreeCommon(temporalMode, disableLazyLoad, readOnly, null);
+    this.rootNode = buildRootNode(desc);
  }

  /**
@@ -100,12 +101,13 @@ public final class SqlTreeBuilder {
    this.alias = new SqlTreeAlias(request.baseTableAlias(), temporalMode);
    this.distinctOnPlatform = builder.isPlatformDistinctOn();
    this.platformDistinctNoLobs = builder.isPlatformDistinctNoLobs();
+    this.common = new SqlTreeCommon(temporalMode, disableLazyLoad, readOnly, includeJoin);
+    this.rootNode = buildRootNode(desc);
    String fromForUpdate = builder.fromForUpdate(query);
    CQueryHistorySupport historySupport = builder.historySupport(query);
    CQueryDraftSupport draftSupport = builder.draftSupport(query);
-    String colAlias = subQuery ? null : columnAliasPrefix;
+    String colAlias = subQuery || rootNode.isSingleProperty() ? null : columnAliasPrefix;
    this.ctx = new DefaultDbSqlContext(alias, colAlias, historySupport, draftSupport, fromForUpdate);
-    this.common = new SqlTreeCommon(temporalMode, disableLazyLoad, readOnly, includeJoin);
  }

  /**
@@ -113,7 +115,6 @@ public final class SqlTreeBuilder {
   */
  public SqlTree build() {
    // build the appropriate chain of SelectAdapter's
-    buildRoot(desc);
    // build the actual String
    String distinctOn = null;
    String selectSql = null;
@@ -214,8 +215,8 @@ public final class SqlTreeBuilder {
    return ctx.content();
  }

-  private void buildRoot(STreeType desc) {
-    rootNode = buildSelectChain(null, null, desc, null);
+  private SqlTreeNode buildRootNode(STreeType desc) {
+    SqlTreeNode root = buildSelectChain(null, null, desc, null);
    if (!rawSql) {
      alias.addJoin(queryDetail.getFetchPaths(), desc);
      alias.addJoin(predicates.predicateIncludes(), desc);
@@ -224,6 +225,7 @@ public final class SqlTreeBuilder {
      alias.buildAlias();
      predicates.parseTableAlias(alias);
    }
+    return root;
  }

  /**
@@ -335,6 +335,13 @@ public final class DefaultDtoQuery<T> extends AbstractQuery implements SpiDtoQue
    return bindParams;
  }

+  @Override
+  public void setDefaultFetchBuffer(int fetchSize) {
+    if (bufferFetchSizeHint == 0) {
+      bufferFetchSizeHint = fetchSize;
+    }
+  }
+
  @Override
  public DtoQuery<T> setBufferFetchSizeHint(int bufferFetchSizeHint) {
    this.bufferFetchSizeHint = bufferFetchSizeHint;
@@ -1481,21 +1481,11 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
    return server.delete(this);
  }

-  @Override
-  public final int delete(Transaction transaction) {
-    return server.delete(this);
-  }
-
  @Override
  public final int update() {
    return server.update(this);
  }

-  @Override
-  public final int update(Transaction transaction) {
-    return server.update(this);
-  }
-
  @Override
  public final <A> List<A> findIds() {
    // a copy of this query is made in the server
@@ -206,6 +206,13 @@ public final class DefaultRelationalQuery extends AbstractQuery implements SpiSq
    return bindParams;
  }

+  @Override
+  public final void setDefaultFetchBuffer(int fetchSize) {
+    if (bufferFetchSizeHint == 0) {
+      bufferFetchSizeHint = fetchSize;
+    }
+  }
+
  @Override
  public DefaultRelationalQuery setBufferFetchSizeHint(int bufferFetchSizeHint) {
    this.bufferFetchSizeHint = bufferFetchSizeHint;
@@ -247,7 +247,7 @@ public final class OrmQueryProperties implements Serializable {
    }

    if (orderBy != null) {
-      query.setOrder(orderBy.copyWithTrim(path));
+      query.setOrderBy(orderBy.copyWithTrim(path));
    }
  }

@@ -7,7 +7,6 @@ import io.ebean.plugin.SpiServer;
 import io.ebeaninternal.api.SpiLogManager;
 import io.ebeaninternal.api.SpiProfileHandler;
 import io.ebeaninternal.server.cluster.ClusterManager;
-import io.ebeaninternal.server.core.ClockService;
 import io.ebeaninternal.server.deploy.BeanDescriptorManager;
 import io.ebeanservice.docstore.api.DocStoreUpdateProcessor;

@@ -30,13 +29,11 @@ public final class TransactionManagerOptions {
  final SpiLogManager logManager;
  final TableModState tableModState;
  final ServerCacheNotify cacheNotify;
-  final ClockService clockService;
-

  public TransactionManagerOptions(SpiServer server, boolean notifyL2CacheInForeground, DatabaseBuilder.Settings config, TransactionScopeManager scopeManager,
                                   ClusterManager clusterManager, BackgroundExecutor backgroundExecutor, DocStoreUpdateProcessor docStoreUpdateProcessor,
                                   BeanDescriptorManager descMgr, DataSourceSupplier dataSourceSupplier, SpiProfileHandler profileHandler,
-                                   SpiLogManager logManager, TableModState tableModState, ServerCacheNotify cacheNotify, ClockService clockService) {
+                                   SpiLogManager logManager, TableModState tableModState, ServerCacheNotify cacheNotify) {
    this.server = server;
    this.notifyL2CacheInForeground = notifyL2CacheInForeground;
    this.config = config;
@@ -50,7 +47,6 @@ public final class TransactionManagerOptions {
    this.logManager = logManager;
    this.tableModState = tableModState;
    this.cacheNotify = cacheNotify;
-    this.clockService = clockService;
  }

 }
@@ -7,6 +7,7 @@ import io.ebean.config.*;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.DbPlatformType;
 import io.ebean.core.type.*;
+import io.ebean.plugin.Lookups;
 import io.ebean.types.Cidr;
 import io.ebean.types.Inet;
 import io.ebean.util.AnnotationUtil;
@@ -20,6 +21,7 @@ import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
 import jakarta.persistence.AttributeConverter;
 import jakarta.persistence.EnumType;
 import java.io.File;
+import java.lang.invoke.MethodType;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.ParameterizedType;
@@ -597,19 +599,20 @@ public final class DefaultTypeManager implements TypeManager {
  private void initialiseCustomScalarTypes(BootupClasses bootupClasses) {
    for (Class<? extends ScalarType<?>> cls : bootupClasses.getScalarTypes()) {
      try {
+        var lookup = Lookups.getLookup(cls);
        ScalarType<?> scalarType;
        if (objectMapper == null) {
-          scalarType = cls.getDeclaredConstructor().newInstance();
+          scalarType = Lookups.newDefaultInstance(cls);
        } else {
          try {
            // first try objectMapper constructor
-            scalarType = cls.getDeclaredConstructor(ObjectMapper.class).newInstance(objectMapper);
+            scalarType = (ScalarType<?>) lookup.findConstructor(cls, MethodType.methodType(ObjectMapper.class)).invoke(objectMapper);
          } catch (NoSuchMethodException e) {
-            scalarType = cls.getDeclaredConstructor().newInstance();
+            scalarType = Lookups.newDefaultInstance(cls);
          }
        }
        add(scalarType);
-      } catch (Exception e) {
+      } catch (Throwable e) {
        log.log(ERROR, "Error loading ScalarType " + cls.getName(), e);
      }
    }
@@ -639,11 +642,11 @@ public final class DefaultTypeManager implements TypeManager {
        if (wrappedType == null) {
          throw new IllegalStateException("Could not find ScalarType for: " + paramTypes[1]);
        }
-        ScalarTypeConverter converter = foundType.getDeclaredConstructor().newInstance();
+        ScalarTypeConverter converter = Lookups.newDefaultInstance(foundType);
        ScalarTypeWrapper stw = new ScalarTypeWrapper(logicalType, wrappedType, converter);
        log.log(DEBUG, "Register ScalarTypeWrapper from {0} -> {1} using:{2}", logicalType, persistType, foundType);
        add(stw);
-      } catch (Exception e) {
+      } catch (Throwable e) {
        log.log(ERROR, "Error registering ScalarTypeConverter " + foundType.getName(), e);
      }
    }
@@ -663,11 +666,11 @@ public final class DefaultTypeManager implements TypeManager {
        if (wrappedType == null) {
          throw new IllegalStateException("Could not find ScalarType for: " + paramTypes[1]);
        }
-        AttributeConverter converter = foundType.getDeclaredConstructor().newInstance();
+        AttributeConverter converter =  Lookups.newDefaultInstance(foundType);
        ScalarTypeWrapper stw = new ScalarTypeWrapper(logicalType, wrappedType, new AttributeConverterAdapter(converter));
        log.log(DEBUG, "Register ScalarTypeWrapper from {0} -> {1} using:{2}", logicalType, persistType, foundType);
        add(stw);
-      } catch (Exception e) {
+      } catch (Throwable e) {
        log.log(ERROR, "Error registering AttributeConverter " + foundType.getName(), e);
      }
    }
@@ -8,7 +8,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class TableJoinColumnTest {

  TableJoinColumn col(String localDbColumn, String foreignDbColumn, boolean insertable, boolean updateable) {
-    DeployTableJoinColumn column = new DeployTableJoinColumn(localDbColumn, foreignDbColumn, insertable, updateable);
+    DeployTableJoinColumn column = new DeployTableJoinColumn(localDbColumn, foreignDbColumn, insertable, updateable, true);
    return new TableJoinColumn(column);
  }

@@ -9,22 +9,22 @@ import static org.assertj.core.api.Assertions.assertThat;

 public class TableJoinTest {

-  DeployTableJoinColumn col(String localDbColumn, String foreignDbColumn, boolean insertable, boolean updateable) {
-    return new DeployTableJoinColumn(localDbColumn, foreignDbColumn, insertable, updateable);
+  DeployTableJoinColumn col(String localDbColumn, String foreignDbColumn, boolean insertable, boolean updateable, boolean nullable) {
+    return new DeployTableJoinColumn(localDbColumn, foreignDbColumn, insertable, updateable, nullable);
  }

  TableJoin table(String tableName, String col1, String col2) {
    DeployTableJoin deploy = new DeployTableJoin();
    deploy.setTable(tableName);
-    deploy.addJoinColumn(col(col1, col2, true, true));
+    deploy.addJoinColumn(col(col1, col2, true, true, true));
    return new TableJoin(deploy);
  }

  TableJoin table(String tableName, String col1, String col2, String col3, String col4) {
    DeployTableJoin deploy = new DeployTableJoin();
    deploy.setTable(tableName);
-    deploy.addJoinColumn(col(col1, col2, true, true));
-    deploy.addJoinColumn(col(col3, col4, true, true));
+    deploy.addJoinColumn(col(col1, col2, true, true, true));
+    deploy.addJoinColumn(col(col3, col4, true, true, true));
    return new TableJoin(deploy);
  }

@@ -151,11 +151,11 @@ public class OrmQueryPlanKeyTest extends BaseTest {
  @Test
  public void equals_when_diffOrderByNull() {

-    CQueryPlanKey key1 = planKey(query().order("id"));
+    CQueryPlanKey key1 = planKey(query().orderBy("id"));
    CQueryPlanKey key2 = planKey(query());
    assertDifferent(key1, key2);

-    key1 = planKey(query().order().asc("id"));
+    key1 = planKey(query().orderBy().asc("id"));
    key2 = planKey(query());
    assertDifferent(key1, key2);
  }
@@ -163,8 +163,8 @@ public class OrmQueryPlanKeyTest extends BaseTest {
  @Test
  public void equals_when_orderBySame() {

-    CQueryPlanKey key1 = planKey(query().order("id, name"));
-    CQueryPlanKey key2 = planKey(query().order("id, name"));
+    CQueryPlanKey key1 = planKey(query().orderBy("id, name"));
+    CQueryPlanKey key2 = planKey(query().orderBy("id, name"));
    assertSame(key1, key2);
  }

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.8.0</version>
+      <version>14.10.0</version>
      <scope>provided</scope>
    </dependency>

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

@@ -71,6 +71,8 @@ public class PostgresHistoryDdl extends DbTriggerBasedHistoryDdl {
    apply
      .append("create or replace function ").append(procedureName).append("() returns trigger as $$").newLine();

+    apply.append("-- play-ebean-start").newLine();
+
    apply.append("declare").newLine()
      .append("  lowerTs timestamptz;").newLine()
      .append("  upperTs timestamptz;").newLine();
@@ -93,6 +95,7 @@ public class PostgresHistoryDdl extends DbTriggerBasedHistoryDdl {
    apply
      .append("  end if;").newLine()
      .append("end;").newLine()
+      .append("-- play-ebean-end").newLine()
      .append("$$ LANGUAGE plpgsql;").newLine();

    apply.end();
@@ -10,6 +10,7 @@
 -- Type used to hold common partitioning parameters such as period start and end etc
 ------------------------------------------------------------------------------------
 do $$
+-- play-ebean-start
 begin
  if not exists (select 1 from pg_type where typname = 'partition_meta') THEN
    create type partition_meta as
@@ -22,7 +23,9 @@ begin
      part_name      text
    );
  end if;
-end$$;
+end;
+-- play-ebean-end
+$$;

 ------------------------------------------------------------------------------------
 -- Function: _partition_create
@@ -34,6 +37,7 @@ create or replace function _partition_create(meta partition_meta)
 language plpgsql
 set timezone to 'UTC'
 as $$
+-- play-ebean-start
 begin
  if (meta.schema_name = '') then
    execute format('create table if not exists %I partition of %I for values from (''%s'') TO (''%s'')', meta.part_name, meta.base_name, meta.period_start, meta.period_end);
@@ -42,6 +46,7 @@ begin
  end if;
  return meta.part_name;
 end;
+-- play-ebean-end
 $$;


@@ -60,6 +65,7 @@ create or replace function _partition_meta(
 language plpgsql
 set timezone to 'UTC'
 as $$
+-- play-ebean-start
 declare
  partName  text;
  meta      partition_meta;
@@ -92,6 +98,7 @@ begin

  return meta;
 end;
+-- play-ebean-end
 $$;

 ------------------------------------------------------------------------------------
@@ -108,6 +115,7 @@ create or replace function _partition_over(
  returns TABLE(of_date date)
 language plpgsql
 as $$
+-- play-ebean-start
 declare
  endDate date;
 begin
@@ -132,6 +140,7 @@ begin
    return query select s::date from generate_series(fromDate, endDate, '1 month') s;
  end if;
 end;
+-- play-ebean-end
 $$;


@@ -158,11 +167,13 @@ create or replace function partition(
 language plpgsql
 set timezone to 'UTC'
 as $$
+-- play-ebean-start
 begin
  perform _partition_create(_partition_meta(mode, poDate, baseName, schemaName))
  from _partition_over(mode, fromDate, partitionCount) poDate;
  return 'done';
 end;
+-- play-ebean-end
 $$;
 </ddl-script>

@@ -24,7 +24,9 @@ GO
 -- deletes all indices referring to TABLE.COLUMN
 --
 CREATE OR ALTER PROCEDURE usp_ebean_drop_indices @tableName nvarchar(255), @columnName nvarchar(255)
-AS SET NOCOUNT ON
+AS
+-- play-ebean-start
+SET NOCOUNT ON
 declare @sql nvarchar(1000)
 declare @indexName nvarchar(255)
 BEGIN
@@ -44,6 +46,7 @@ BEGIN
  CLOSE index_cursor;
  DEALLOCATE index_cursor;
 END
+-- play-ebean-end
 GO

 --
@@ -51,7 +54,9 @@ GO
 -- deletes the default constraint, which has a random name
 --
 CREATE OR ALTER PROCEDURE usp_ebean_drop_default_constraint @tableName nvarchar(255), @columnName nvarchar(255)
-AS SET NOCOUNT ON
+AS
+-- play-ebean-start
+SET NOCOUNT ON
 declare @tmp nvarchar(1000)
 BEGIN
  select @tmp = t1.name from sys.default_constraints t1
@@ -60,6 +65,7 @@ BEGIN

  if @tmp is not null EXEC('alter table [' + @tableName +'] drop constraint ' + @tmp);
 END
+-- play-ebean-end
 GO

 --
@@ -67,7 +73,9 @@ GO
 -- deletes constraints and foreign keys refering to TABLE.COLUMN
 --
 CREATE OR ALTER PROCEDURE usp_ebean_drop_constraints @tableName nvarchar(255), @columnName nvarchar(255)
-AS SET NOCOUNT ON
+AS
+-- play-ebean-start
+SET NOCOUNT ON
 declare @sql nvarchar(1000)
 declare @constraintName nvarchar(255)
 BEGIN
@@ -93,6 +101,7 @@ BEGIN
  CLOSE name_cursor;
  DEALLOCATE name_cursor;
 END
+-- play-ebean-end
 GO

 --
@@ -100,7 +109,9 @@ GO
 -- deletes the column annd ensures that all indices and constraints are dropped first
 --
 CREATE OR ALTER PROCEDURE usp_ebean_drop_column @tableName nvarchar(255), @columnName nvarchar(255)
-AS SET NOCOUNT ON
+AS
+-- play-ebean-start
+SET NOCOUNT ON
 declare @sql nvarchar(1000)
 BEGIN
  EXEC usp_ebean_drop_indices @tableName, @columnName;
@@ -110,6 +121,7 @@ BEGIN
  set @sql = 'alter table [' + @tableName + '] drop column [' + @columnName + ']';
  EXECUTE(@sql);
 END
+-- play-ebean-end
 GO
 </ddl-script>
 <ddl-script name="create procs" platforms="mysql mariadb" init="true">-- Inital script to create stored procedures etc for mysql platform
@@ -121,6 +133,7 @@ delimiter $$
 -- deletes all constraints and foreign keys referring to TABLE.COLUMN
 --
 CREATE PROCEDURE usp_ebean_drop_foreign_keys(IN p_table_name VARCHAR(255), IN p_column_name VARCHAR(255))
+-- play-ebean-start
 BEGIN
 DECLARE done INT DEFAULT FALSE;
 DECLARE c_fk_name CHAR(255);
@@ -142,6 +155,7 @@ EXECUTE stmt;
 END LOOP;

 CLOSE curs;
+-- play-ebean-end
 END
 $$

@@ -153,11 +167,13 @@ delimiter $$
 -- deletes the column and ensures that all indices and constraints are dropped first
 --
 CREATE PROCEDURE usp_ebean_drop_column(IN p_table_name VARCHAR(255), IN p_column_name VARCHAR(255))
+-- play-ebean-start
 BEGIN
 CALL usp_ebean_drop_foreign_keys(p_table_name, p_column_name);
 SET @sql = CONCAT('ALTER TABLE `', p_table_name, '` DROP COLUMN `', p_column_name, '`');
 PREPARE stmt FROM @sql;
 EXECUTE stmt;
+-- play-ebean-end
 END
 $$
 </ddl-script>
@@ -170,6 +186,7 @@ delimiter $$
 --
 CREATE OR REPLACE PROCEDURE usp_ebean_drop_foreign_keys(IN table_name NVARCHAR(256), IN column_name NVARCHAR(256))
 AS
+-- play-ebean-start
 BEGIN
 DECLARE foreign_key_names TABLE(CONSTRAINT_NAME NVARCHAR(256), TABLE_NAME NVARCHAR(256));
 DECLARE i INT;
@@ -181,6 +198,7 @@ EXEC 'ALTER TABLE "' || ESCAPE_DOUBLE_QUOTES(:foreign_key_names.TABLE_NAME[i]) |
 END FOR;

 END;
+-- play-ebean-end
 $$

 delimiter $$
@@ -190,10 +208,12 @@ delimiter $$
 --
 CREATE OR REPLACE PROCEDURE usp_ebean_drop_column(IN table_name NVARCHAR(256), IN column_name NVARCHAR(256))
 AS
+-- play-ebean-start
 BEGIN
 CALL usp_ebean_drop_foreign_keys(table_name, column_name);
 EXEC 'ALTER TABLE "' || UPPER(ESCAPE_DOUBLE_QUOTES(table_name)) || '" DROP ("' || UPPER(ESCAPE_DOUBLE_QUOTES(column_name)) || '")';
 END;
+-- play-ebean-end
 $$
 </ddl-script>
 </extra-ddl>
@@ -3,7 +3,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.8.0</version>
+    <version>14.10.0</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>

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

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

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

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

@@ -54,7 +54,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>14.8.0</version>
+      <version>14.10.0</version>
      <scope>test</scope>
    </dependency>

@@ -78,7 +78,7 @@
        <extensions>true</extensions>
        <configuration>
          <tiles>
-            <tile>io.ebean.tile:enhancement:14.8.0</tile>
+            <tile>io.ebean.tile:enhancement:14.10.0</tile>
          </tiles>
        </configuration>
      </plugin>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.8.0</version>
+    <version>14.10.0</version>
  </parent>

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

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

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

@@ -86,7 +86,7 @@
        <extensions>true</extensions>
        <configuration>
          <tiles>
-            <tile>io.ebean.tile:enhancement:14.8.0</tile>
+            <tile>io.ebean.tile:enhancement:14.10.0</tile>
          </tiles>
        </configuration>
      </plugin>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.8.0</version>
+    <version>14.10.0</version>
  </parent>

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

@@ -59,14 +59,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-ddl-generator</artifactId>
-      <version>14.8.0</version>
+      <version>14.10.0</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>14.8.0</version>
+      <version>14.10.0</version>
      <scope>test</scope>
    </dependency>

@@ -80,7 +80,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>querybean-generator</artifactId>
-      <version>14.8.0</version>
+      <version>14.10.0</version>
      <scope>provided</scope>
    </dependency>

@@ -96,7 +96,7 @@
        <extensions>true</extensions>
        <configuration>
          <tiles>
-            <tile>io.ebean.tile:enhancement:14.8.0</tile>
+            <tile>io.ebean.tile:enhancement:14.10.0</tile>
          </tiles>
        </configuration>
      </plugin>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Rob Bygrave	c13e09257c	Version 14.10.0	2025-03-11 21:26:00 +13:00
Rob Bygrave	ed65433640	Merge pull request #3574 from ebean-orm/feature/3459-postgres-varchar #3459 Postgres varchar default to no length (aka text)	2025-03-11 20:01:26 +13:00
Rob Bygrave	08890e9d5a	Merge pull request #3590 from ebean-orm/feature/3580-lookwriter-logWarn Adjust LookupWriter to log at WARN rather than ERROR due to Quarkus dev mode	2025-03-10 23:56:19 +13:00
Rob Bygrave	4273c4af6a	Adjust LookupWriter to log at WARN rather than ERROR due to Quarkus dev mode Die to Quarkus dev mode (#3541 #3582) we want to log FilerException at WARN level rather than ERROR. This is because Quarkus dev mode will invoke the annotation processor more than usual, so we expect to fail with the FilerException.	2025-03-10 23:42:38 +13:00
Rob Bygrave	51424d9eea	Merge pull request #3580 from SentryMan/feature/lookup-generation [querybean-generator] Generate lookup for modules	2025-03-10 23:31:35 +13:00
Rob Bygrave	cf2ab33903	Merge pull request #3589 from ebean-orm/feature/bump-ebean-agent-dependency Bump ebean-agent to 14.10.0	2025-03-10 23:28:05 +13:00
Rob Bygrave	90d8b4fb04	Bump ebean-agent to 14.10.0	2025-03-10 23:27:02 +13:00
Rob Bygrave	ff4eeff264	Merge pull request #3588 from ebean-orm/feature/3586-querybean-gen [query bean generation] #3586 public constructor for Embedded bean	2025-03-10 08:02:03 +13:00
Rob Bygrave	64ba343e35	[query bean generation] #3586 public constructor for Embedded bean	2025-03-10 07:59:33 +13:00
Rob Bygrave	af3c59c0fd	Merge pull request #3587 from ebean-orm/feature/bump-test-containers-77 Bump ebean-test-containers dependency - improved SQL Server handling	2025-03-10 07:40:31 +13:00
Rob Bygrave	ae55d28026	Bump ebean-test-containers dependency - improved SQL Server handling Improvments around collation changes that end up making SQL Server startup flaky	2025-03-10 07:40:02 +13:00
Rob Bygrave	ddffc8eee2	Merge pull request #3581 from apflieger/#3573-initfields-prevent-secondary-query OneToMany initialisation via List.of() - was Tests only - new test on multiple many joins	2025-03-10 07:30:40 +13:00
Rob Bygrave	7f1a3a46cf	#3581 ebean-agent 14.10.0 handling for OneToMany initialisation	2025-03-10 07:12:20 +13:00
Rob Bygrave	a59f75a468	Merge pull request #3585 from nedge/feature/Create_test_entities Simple Test Entities in preparation for type scoped loading	2025-03-05 08:06:39 +13:00
Eddie Mc Greal	6f1c66ecd6	Simple Test Entities in preparation for type scoped loading	2025-03-04 14:17:08 +01:00
Rob Bygrave	25f6fb6d6f	test only - Almost fix the model for test_manyNonRoot_RootHasNoMany The test was using field access??? when that isn't valid unless we specifically turn on enhancement to support that. Using proper method access though stops the test from failing.	2025-03-03 21:42:15 +13:00
Rob Bygrave	852def8536	test only - use assertThat hasSize instead of assertEquals for test_manyNonRoot_RootHasNoMany	2025-03-03 21:34:22 +13:00
Rob Bygrave	dfb29fd75f	Merge pull request #3578 from mkurz/fix_3577 Work around `mysqldump` bug by moving comment one line up	2025-03-03 21:26:40 +13:00
Rob Bygrave	80c3501197	Merge pull request #3583 from ebean-orm/feature/revert-3541-3582 [querybean-generator] #3582 - Revert #3541 "FilerException trying to write EntityClassRegister with Quarkus dev mode / hot reload "	2025-03-03 21:25:39 +13:00
Rob Bygrave	b4ff5748fc	Merge pull request #3579 from FOCONIS/rollbac-or-commit-before-close Rollback/Commit raw connections before close	2025-03-03 21:25:12 +13:00
Rob Bygrave	64f01f0543	[querybean-generator] #3582 - Revert #3541 "FilerException trying to write EntityClassRegister with Quarkus dev mode / hot reload " This reverts commit `69c25309` and applies the required "Fix" in the initModuleInfoBean() method to catch FilerException and log it at WARN level	2025-03-03 20:49:19 +13:00
Arnaud Pflieger	fee6e0f480	Tests only - new test on multiple many joins This test reproduce the problem of #3573 The field initialization `= List.of();` prevents eager secondary query.	2025-02-28 12:20:18 +01:00
Josiah Noel	50b44c4529	Update LookupWriter.java	2025-02-28 00:29:03 -05:00
Josiah Noel	f0c2ba0e28	[Feature] Generate lookup for modules Generate Lookup Class for modular projects	2025-02-27 20:47:16 -05:00
Roland Praml	7643dc9b22	Rollback/Commit raw transactions before close	2025-02-27 10:56:41 +01:00
Matthias Kurz	c49a1b3d71	Work around mysqldump bug by moving comment one line up It seems like mysqldump just adds ;; to the last line and does not check if that line is a comment. To work around that it's good enough to move the comment one line up - as long as the END does not end with ; (which here it does not so that is ok)	2025-02-26 15:36:20 +01:00
Rob Bygrave	11e783938c	Merge pull request #3576 from ebean-orm/feature/bump-ebean-test-containers #3511 bump ebean-test-containers dependency	2025-02-26 23:18:43 +13:00
Rob Bygrave	3845861e24	test only - Fix tests due to automatic inline comment included in generated sql like: select /* TestQueryDefaultBatchSize.test_findEach_details__lazy / t0.order_id, t0.id, select / TestQueryDefaultBatchSize.test_findEach_details__lazy */ t0.order_id	2025-02-26 23:15:51 +13:00
Rob Bygrave	d04181865c	test only - update TestOrderByWithMany which is flaky	2025-02-26 23:10:55 +13:00
Rob Bygrave	00d7db31d6	test only - update TestQueryFindIterate which is flaky	2025-02-26 23:07:53 +13:00
Rob Bygrave	6880b5673a	#3511 bump ebean-test-containers dependency ebean-test-containers version 7.6 supports extraDb for MySql and MariaDb, resolving #3511 with extraDb configuration for each extra schema/database required with MySql or MariaDb.	2025-02-26 22:24:05 +13:00
Rob Bygrave	e18b59a9dd	Remove deprecated ExtendedServer.setClock() migrate to DatabaseBuilder.clock() (#3566 ) So we can no longer dynamically change the Clock being used and instead for testing purposes need to create the Database with a test clock instance as needed. Refer to the ExtendedServerTest for an example	2025-02-26 22:16:12 +13:00
Rob Bygrave	cc48dced09	#3572 DDL support for non-nullable JoinColumn column (#3575 )	2025-02-26 21:13:50 +13:00
Rob Bygrave	b13bdc95be	#3459 Postgres varchar default to no length (aka text) Change Postgres platform to default a String to varchar [with no length defined] rather than varchar(255)	2025-02-26 18:53:08 +13:00
Rob Bygrave	0a5c3ced21	Test only - update TestQueryMultiManyOrder sql asserts No effective change.	2025-02-26 00:59:57 +13:00
Rob Bygrave	40637bd68c	Allow OneToOne to map to ManyToOne (#3569 )	2025-02-19 20:00:15 +13:00
Rob BygraveandJonas Pöhler	8dd438be61	#3564 Fix for nested transaction with batch-mode does not flush (#3565 ) * ADD: Testcase for showing nested transaction with batch-mode not flushing batch on commit * Update test only - TestNestedTransaction.test_txn_nestedWithInnerBatch() Update the test to show that we desire the nested transaction changes to be "visible" after a commit regardless of flushOnQuery etc * #3564 Fix for nested transaction with batch-mode does not flush - Adds flush() into ScopeTrans.commitTransaction() - Related fixes in DefaultServer execute() and executeCall() where it was performing extra unnecessary nesting on PersistenceException * Touch --------- Co-authored-by: Jonas Pöhler <jonas.poehler@foconis.de>	2025-02-18 07:33:48 +13:00
Rob Bygrave	5e1ad29c5d	Build - add workflow_dispatch trigger to main build	2025-02-17 07:46:20 +13:00
Rob Bygrave	9eeb137907	Tests only - update test-kotlin dependency	2025-02-17 07:33:56 +13:00
Rob Bygrave	578a041c9e	Version 14.9.0	2025-02-12 19:56:14 +13:00
Rob Bygrave	b0b2a0d320	Bump ebean-agent to 14.9.0 with module path support for @Transactional	2025-02-12 19:36:48 +13:00
Josiah NoelandRob Bygrave	de81dfc067	Feature: Add a `MethodHandles.Lookup` SPI (#3535 ) * ServiceLoad lookups * remove more reflection * address comments * Update DefaultTypeManager.java * Javadoc and format changes --------- Co-authored-by: Rob Bygrave <robin.bygrave@gmail.com>	2025-02-12 19:30:05 +13:00
Rob Bygrave	2bd53cb52b	Merge pull request #3560 from ebean-orm/feature/3533-aop-transactional #3533 Support @Transactional on module path	2025-02-12 18:53:57 +13:00
Rob Bygrave	a6d792de64	Merge pull request #3563 from ebean-orm/feature/remove-deprecated-queryOrder Remove deprecated order() migrate to orderBy()	2025-02-12 18:52:53 +13:00
Rob Bygrave	c73d83ef33	Merge pull request #3562 from ebean-orm/feature/remove-deprecated-queryUpdTxn Remove deprecated query.update(txn) & query.delete(txn)	2025-02-12 18:52:18 +13:00
Rob Bygrave	9f1b4ba758	Remove deprecated order() migrate to orderBy()	2025-02-12 18:47:16 +13:00
Rob Bygrave	1f7117da25	Merge pull request #3561 from ebean-orm/feature/remove-deprecated-servletContextListener Remove deprecated ServletContextListener	2025-02-12 18:43:55 +13:00
Rob Bygrave	f0ceab43bf	Remove deprecated query.update(txn) & query.delete(txn) Migrate to query.usingTransaction(txn)	2025-02-12 18:42:23 +13:00
Rob Bygrave	1107e4ea4c	Remove deprecated ServletContextListener	2025-02-12 18:38:17 +13:00
Rob Bygrave	4dd8a5dfea	Merge pull request #3558 from ebean-orm/feature/3557-filterMany-removal #3557 [Query beans] Remove deprecated filterMany(String expressions, Object... params) from generated query beans	2025-02-12 18:01:39 +13:00
Rob Bygrave	195edf0355	Merge pull request #3514 from ebean-orm/feature/querybean-txn-ctor Remove deprecated QueryBean constructor that takes transaction, migrate to query.usingTransaction()	2025-02-12 18:01:03 +13:00
Rob Bygrave	e9c438adab	Merge branch 'master' into feature/querybean-txn-ctor	2025-02-12 15:05:57 +13:00
Rob Bygrave	e45cf5fab9	#3533 Bump ebean-agent to use the new AOPTransactionScope	2025-02-12 00:27:07 +13:00
Rob Bygrave	1bf9d1dd4f	Merge pull request #3559 from ebean-orm/feature/findCount-noId FindCount on entity bean without @Id + platform wants column alias	2025-02-12 00:01:24 +13:00
Rob Bygrave	657920c4a2	#3533 Support @Transactional on module path As HelpScopeTrans isn't in an exported package it's use fails with an error in module path. This adds AOPTransactionScope in the exported package io.ebean.plugin and moves the required methods from SpiEbeanServer to SpiServer to support this move. This also requires an associate change in ebean-agent to support this feature which will be in ebean-agent 14.9.0.	2025-02-11 23:57:18 +13:00
Rob Bygrave	6c47107436	FindCount on entity bean without @Id + platform wants column alias Internally in CQueryBuilder only use query.setSelectId(); for findCount when the entity bean has a @Id property [which it doesn't strictly need and likely won't have for view based entities]	2025-02-11 23:04:02 +13:00
Rob Bygrave	88cf4e001a	#3557 [Query beans] Remove deprecated filterMany(String expressions, Object... params) from generated query beans, migrate to filterManyRaw()	2025-02-11 22:06:20 +13:00
Rob Bygrave	7f1fcbcf92	Merge pull request #3556 from ebean-orm/feature/test-containers-bump Bump ebean-test-containers to 7.5	2025-02-10 21:55:18 +13:00
Rob Bygrave	95d5d5e467	Bump ebean-test-containers to 7.5	2025-02-10 21:54:54 +13:00
Rob Bygrave	2dde23d577	Merge pull request #3555 from ebean-orm/feature/3503-kotlin-querybean-gen-DbMap #3503 - Fix kotlin-querybean-generator for use of @DbMap	2025-02-10 14:01:09 +13:00
Rob Bygrave	1ec26d13f9	#3503 - Fix kotlin-querybean-generator for use of @DbMap	2025-02-10 11:35:44 +13:00
Rob Bygrave	bb1b55e897	Reduce frequency of running yugabyte CI test	2025-02-09 22:45:10 +13:00
Rob Bygrave	fb07447df4	Fix test only - test-kotlin bump kotlin-querybean-generator version	2025-02-09 22:43:02 +13:00
Rob Bygrave	ad18b6573c	Version 14.8.2	2025-02-09 22:07:28 +13:00
Rob Bygrave	11632c3a6e	Merge pull request #3554 from ebean-orm/feature/3536-kotlin-querybean-generator #3536 kotlin-querybean-generator update for filterMany() changes	2025-02-09 21:37:38 +13:00
Rob Bygrave	b066f9c072	#3536 kotlin-querybean-generator update for filterMany() changes Brings the kotlin-querybean-generator up to date with the [java] querybean-generator in terms of how it has specific "associated beans" for ToOne and ToMany type relationships	2025-02-09 21:24:51 +13:00
Rob Bygrave	1e38ed9efc	Test only, add Embedded bean as an inner class for querybean-generation	2025-02-09 21:19:39 +13:00
Roland Praml	2d48dd2fef	Pass create/configOptions to DB2 test container (#3550 ) This allows to pass collation/pagesize settings via the `ebean.test.createOptions=` property to the container	2025-02-08 19:47:20 +13:00
Rob Bygrave	60aa899a34	#3552 Column alias required for SQL Server + findCount + distinct (#3553 ) * #3552 Column alias required for SQL Server + findCount + distinct - Modifies CQueryBuilder with the main fix which is to use the database platform selectCountWithColumnAlias for all distinct queries [and later disable it for single column case] - Modifies SqlTreeBuilder because we need to NOT use the column alias for the count distinct SINGLE COLUMN case. So change here to: - build the root SqlTreeNode first as part of constructor - use rootNode.isSingleProperty() to NOT use column alias for the single column case - Hence need to initialise DefaultDbSqlContext AFTER the root SqlTreeNode - Modifies DefaultDbSqlContext with no effective change, just columnIndex++ ONLY when we are actually using column alias - Modifies H2Platform to also use selectCountWithColumnAlias true * #3552 selectCountWithColumnAlias true for MariaDB and MySql Plus fix TestRowCount for Oracle platform	2025-02-08 19:33:03 +13:00
Rob Bygrave	c38c75fdec	Merge pull request #3549 from ebean-orm/feature/3546 #3546 Reduce compiler warning on query bean generated code	2025-01-28 23:34:23 +13:00
Rob Bygrave	cf275f4edd	#3546 Reduce compiler warning on query bean generated code This method is effectively internal and called by generated code that also is Deprecated(forRemoval = true)	2025-01-28 23:31:23 +13:00
Rob Bygrave	121f4afed8	#3545 Support @SQL entity with a OneToOne with EmbeddedId - @Sql entity - Has a OneToOne or ManyToOne to a bean that uses @EmbeddedId	2025-01-28 23:26:09 +13:00
Rob Bygrave	c8621c3a29	Put back the querybean-generator version	2025-01-16 21:42:02 +13:00
Rob Bygrave	f83da15d5e	Merge pull request #3542 from ebean-orm/feature/3542-quarkus [querybean-generator] FilerException trying to write EntityClassRegister with Quarkus dev mode / hot reload #3541	2025-01-16 16:46:46 +13:00
Rob Bygrave	52729d9802	Missing import and adjust warning message	2025-01-16 16:40:43 +13:00
Rob Bygrave	69c25309da	[querybean-generator] FilerException trying to write EntityClassRegister with Quarkus dev mode / hot reload #3541 Drop to log at WARN level when we catch FilerException such that Quarkus dev mode / hot reload works	2025-01-16 16:31:52 +13:00
Rob Bygrave	723a12fd66	#3538 Restoring batchMode etc with nested transaction scopes This change is a simplification such that these batch attributes are always stored and restored for nested ScopeTrans. There are no expensive side effects of doing it this way. This fixes issues where the batch attributes are changed after the ScopeTrans is created (like the test for this PR).	2025-01-16 08:15:22 +13:00
Noemi Praml	5cf74f1ee9	Add: failing Unittest	2025-01-08 14:43:49 +01:00
Rob Bygrave	2c18b4fe97	Version 14.8.1	2024-12-20 15:34:07 +13:00
Rob Bygrave	9c9fb70999	Bump ebean agent to align	2024-12-20 15:24:08 +13:00
Rob Bygrave	18e6374a60	Merge pull request #3532 from ebean-orm/feature/sql-play-ebean #3408 play-ebean inline sql comment in test generated scripts	2024-12-20 14:59:54 +13:00
Rob Bygrave	3fea5ce93d	#3408 play-ebean inline sql comment in test generated scripts	2024-12-20 14:58:10 +13:00
Rob Bygrave	43675468ae	Merge pull request #3523 from FOCONIS/streaming-tests set defaultFetchBuffer in findEach/findList in SQL and DTO Queries	2024-12-19 11:04:01 +13:00
Rob Bygrave	1c038f4629	Merge pull request #3408 from mkurz/meta_datastored-procedures-DDL Add metadata to stored procedures for 3rd party libs	2024-12-19 10:47:14 +13:00
Rob Bygrave	49b6f3dec9	Merge pull request #3530 from SentryMan/fix/dto-lookup FIX: IllegalAccessError on modular DTO queries	2024-12-19 09:07:45 +13:00
Josiah Noel	346e30217a	Merge remote-tracking branch 'upstream/master' into fix/dto-lookup	2024-12-18 14:56:15 -05:00
Rob Bygrave	5dc165debf	Fix test TestLazyJoin2	2024-12-19 08:42:37 +13:00
Josiah Noel	d5cb7c3ff1	fix illegal access error on modular dtos When using a dto query on a JPMS application, I get an IllegalAccessError even though I export and open my package.	2024-12-18 00:20:08 -05:00
Roland Praml	4d08dce033	set defaultFetchBuffer in findEach/findList in relational/orm Queries	2024-11-27 17:05:15 +01:00
Roland Praml	beef4407e3	Add failing testcase	2024-11-27 17:02:15 +01:00
Matthias Kurz	e99f922de6	Add metadata to stored procedures for 3rd party libs This way a third party can parse the meta data and knows how to handle the bodies of a stored procedure	2024-11-26 23:36:30 +01:00
Rob Bygrave	103e8323f2	Merge pull request #3519 from FOCONIS/no-codechange-test-cleanup No productive code change: cleanup basic test data	2024-11-07 21:32:35 +13:00
Noemi Praml	59ed0bb015	fix delete contacts	2024-11-05 14:04:32 +01:00
Noemi Praml	c0eb896e1f	No productive code change: cleanup basic test data (#114 ) * Erste Tests bereinigt * fix * noch mehr Tests bereinigt * modify output * reformat	2024-11-05 13:16:47 +01:00
Rob Bygrave	ddb4b9d3e5	Remove deprecated QueryBean constructor that takes transaction, migrate to query.usingTransaction() Remove the constructor for QueryBean that takes transaction. Migrate code to use query.usingTransaction() instead.	2024-10-31 18:22:43 +13:00
Rob Bygrave	7035b4c74c	tests only: Update versions in test / test-kotlin maven plugin and apt	2024-10-31 18:19:36 +13:00
Rob Bygrave	85a575e353	Merge pull request #3513 from ebean-orm/feature/bump-parent-javadoc Bump java11-oss parent and tidy javadoc	2024-10-31 17:14:52 +13:00
robin.bygrave	eb05be286c	Bump java11-oss parent and tidy javadoc	2024-10-31 14:55:43 +13:00
Rob Bygrave	9f5a77fdaa	Merge pull request #3509 from FOCONIS/javadoc-fixes RFC: Fix some javadoc issues	2024-10-31 14:47:46 +13:00
Roland Praml	42ee75f212	RFC: Fix some javadoc issues	2024-10-25 08:46:34 +02:00