Version 14.6.0

Bump ebean-agent to 14.6.0
Merge pull request #3481 from ebean-orm/feature/boostrap-service
2026-09-20 19:17:55 +00:00 · 2024-09-17 22:23:13 +12:00 · 2024-09-17 22:09:44 +12:00 · 2024-09-17 22:03:52 +12:00 · 2024-09-17 22:03:13 +12:00 · 2024-09-17 22:02:40 +12:00
256 changed files with 3466 additions and 1450 deletions
@@ -20,14 +20,14 @@ jobs:
        os: [ubuntu-latest]

    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
    - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
      with:
        java-version: ${{ matrix.java_version }}
        distribution: 'zulu'
    - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
      env:
        cache-name: maven-cache
      with:
@@ -20,14 +20,14 @@ jobs:
        os: [ubuntu-latest]

    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
    - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
      with:
        java-version: ${{ matrix.java_version }}
        distribution: 'adopt'
    - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
      env:
        cache-name: maven-cache
      with:
@@ -20,14 +20,14 @@ jobs:
        os: [ubuntu-latest]

    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
    - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
      with:
        java-version: ${{ matrix.java_version }}
        distribution: 'zulu'
    - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
      env:
        cache-name: maven-cache
      with:
@@ -16,18 +16,18 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        java_version: [GA,EA]
+        java_version: [GA,EA,23]
        os: [ubuntu-latest]

    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
    - name: Set up Java
      uses: oracle-actions/setup-java@v1
      with:
        website: jdk.java.net
        release: ${{ matrix.java_version }}
    - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
      env:
        cache-name: maven-cache
      with:
@@ -20,14 +20,14 @@ jobs:
        os: [ubuntu-latest]

    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
    - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
      with:
        java-version: ${{ matrix.java_version }}
        distribution: 'adopt'
    - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
      env:
        cache-name: maven-cache
      with:
@@ -17,14 +17,14 @@ jobs:
        os: [ubuntu-latest]

    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
    - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
      with:
        java-version: ${{ matrix.java_version }}
        distribution: 'adopt'
    - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
      env:
        cache-name: maven-cache
      with:
@@ -20,14 +20,14 @@ jobs:
        os: [ubuntu-latest]

    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
    - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
      with:
        java-version: ${{ matrix.java_version }}
        distribution: 'zulu'
    - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
      env:
        cache-name: maven-cache
      with:
@@ -20,14 +20,14 @@ jobs:
        os: [ubuntu-latest]

    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
    - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
      with:
        java-version: ${{ matrix.java_version }}
        distribution: 'adopt'
    - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
      env:
        cache-name: maven-cache
      with:
@@ -20,14 +20,14 @@ jobs:
        os: [ubuntu-latest]

    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
    - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
      with:
        java-version: ${{ matrix.java_version }}
        distribution: 'zulu'
    - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
      env:
        cache-name: maven-cache
      with:
@@ -20,14 +20,14 @@ jobs:
        os: [ubuntu-latest]

    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
    - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
      with:
        java-version: ${{ matrix.java_version }}
        distribution: 'adopt'
    - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
      env:
        cache-name: maven-cache
      with:
@@ -17,14 +17,14 @@ jobs:
        os: [ubuntu-latest]

    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
    - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
      with:
        java-version: ${{ matrix.java_version }}
        distribution: 'adopt'
    - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
      env:
        cache-name: maven-cache
      with:
@@ -20,14 +20,14 @@ jobs:
        os: [ubuntu-latest]

    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
    - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
      with:
        java-version: ${{ matrix.java_version }}
        distribution: 'adopt'
    - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
      env:
        cache-name: maven-cache
      with:
@@ -20,14 +20,14 @@ jobs:
        os: [ubuntu-latest]

    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
    - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
      with:
        java-version: ${{ matrix.java_version }}
        distribution: 'adopt'
    - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
      env:
        cache-name: maven-cache
      with:
@@ -56,7 +56,7 @@ Work at the highest level of abstraction and drop down levels as needed.
    <tr>
      <td align="center" valign="middle">
        <a href="https://www.foconis.de/" target="_blank">
-          <img width="222px" src="https://www.foconis.de/templates/yootheme/cache/foconis_logo_322-709da1de.png">
+          <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">
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>14.6.0</version>
    <relativePath>../..</relativePath>
  </parent>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.6.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>14.1.0</version>
+      <version>14.6.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.6.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.1.0</version>
+      <version>14.6.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.6.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-db2</artifactId>
-      <version>14.1.0</version>
+      <version>14.6.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.6.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>14.1.0</version>
+      <version>14.6.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.6.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-hana</artifactId>
-      <version>14.1.0</version>
+      <version>14.6.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.6.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mariadb</artifactId>
-      <version>14.1.0</version>
+      <version>14.6.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.6.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mysql</artifactId>
-      <version>14.1.0</version>
+      <version>14.6.0</version>
    </dependency>

  </dependencies>
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>ebean-parent</artifactId>
+    <groupId>io.ebean</groupId>
+    <version>14.6.0</version>
+    <relativePath>../..</relativePath>
+  </parent>
+
+  <name>ebean-net-postgis</name>
+  <description>ebean-net-postgis composite</description>
+  <artifactId>ebean-net-postgis</artifactId>
+
+  <properties>
+    <postgis.jdbc.version>2023.1.0</postgis.jdbc.version>
+    <postgres.jdbc.version>42.7.2</postgres.jdbc.version>
+  </properties>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-api</artifactId>
+      <version>14.6.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-core</artifactId>
+      <version>14.6.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-datasource</artifactId>
+      <version>${ebean-datasource.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-migration</artifactId>
+      <version>${ebean-migration.version}</version>
+    </dependency>
+
+    <!-- Technically optional but most expected to use query beans -->
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-querybean</artifactId>
+      <version>14.6.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-platform-postgres</artifactId>
+      <version>14.6.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-net-postgis-types</artifactId>
+      <version>14.6.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.postgresql</groupId>
+      <artifactId>postgresql</artifactId>
+      <version>${postgres.jdbc.version}</version>
+      <exclusions>
+        <!-- exclude unnecessary checker framework -->
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>net.postgis</groupId>
+      <artifactId>postgis-jdbc</artifactId>
+      <version>${postgis.jdbc.version}</version>
+    </dependency>
+
+  </dependencies>
+</project>
@@ -0,0 +1,7 @@
+package io.ebean.postgis.assembly;
+
+/**
+ * Nothing interesting here - required placeholder for javadoc.
+ */
+public class Assembly {
+}
@@ -0,0 +1,10 @@
+module io.ebean.postgis {
+
+  requires transitive io.ebean.api;
+  requires transitive io.ebean.core;
+  requires transitive io.ebean.datasource;
+  requires transitive io.ebean.querybean;
+  requires transitive io.ebean.platform.postgres;
+  // requires transitive io.ebean.postgis.types;
+
+}
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>14.6.0</version>
    <relativePath>../..</relativePath>
  </parent>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.6.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-nuodb</artifactId>
-      <version>14.1.0</version>
+      <version>14.6.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.6.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-oracle</artifactId>
-      <version>14.1.0</version>
+      <version>14.6.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.6.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.1.0</version>
+      <version>14.6.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-postgis-types</artifactId>
-      <version>14.1.0</version>
+      <version>14.6.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.6.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.1.0</version>
+      <version>14.6.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.6.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlite</artifactId>
-      <version>14.1.0</version>
+      <version>14.6.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.6.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>14.1.0</version>
+      <version>14.6.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.6.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.1.0</version>
+      <version>14.6.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.6.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-all</artifactId>
-      <version>14.1.0</version>
+      <version>14.6.0</version>
    </dependency>

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

  <artifactId>composites</artifactId>
@@ -24,6 +24,7 @@
    <module>ebean-oracle</module>
    <module>ebean-postgres</module>
    <module>ebean-postgis</module>
+    <module>ebean-net-postgis</module>
 <!--    <module>sqlanywhere</module>-->
    <module>ebean-sqlite</module>
    <module>ebean-sqlserver</module>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>14.6.0</version>
  </parent>

  <name>ebean api</name>
@@ -0,0 +1,50 @@
+package io.ebean;
+
+final class DPaging implements Paging {
+
+  static final Paging NONE = new DPaging(0, 0, null);
+
+  static Paging build(int pgIndex, int pgSize, OrderBy<?> orderBy) {
+    return new DPaging(pgIndex, pgSize, orderBy);
+  }
+
+  static Paging build(int pgIndex, int pgSize) {
+    return new DPaging(pgIndex, pgSize, null);
+  }
+
+  private final int pageNumber;
+  private final int pageSize;
+  private final OrderBy<?> orderBy;
+
+  DPaging(int pageNumber, int pageSize, OrderBy<?> orderBy) {
+    this.pageNumber = pageNumber;
+    this.pageSize = pageSize;
+    this.orderBy = orderBy;
+  }
+
+  @Override
+  public int pageIndex() {
+    return pageNumber;
+  }
+
+  @Override
+  public int pageSize() {
+    return pageSize;
+  }
+
+  @Override
+  public OrderBy<?> orderBy() {
+    return orderBy;
+  }
+
+  @Override
+  public Paging withPage(int pageNumber) {
+    return new DPaging(pageNumber, pageSize, orderBy);
+  }
+
+  @Override
+  public Paging withOrderBy(String orderByClause) {
+    return new DPaging(pageNumber, pageSize, OrderBy.of(orderByClause));
+  }
+
+}
@@ -5,8 +5,6 @@ import io.ebean.service.SpiContainer;
 import io.ebean.service.SpiContainerFactory;
 import jakarta.persistence.PersistenceException;

-import java.util.Iterator;
-import java.util.ServiceLoader;
 import java.util.concurrent.locks.ReentrantLock;

 /**
@@ -157,10 +155,10 @@ public final class DatabaseFactory {
   * Create the container instance using the configuration.
   */
  private static SpiContainer createContainer(ContainerConfig containerConfig) {
-    Iterator<SpiContainerFactory> factories = ServiceLoader.load(SpiContainerFactory.class).iterator();
-    if (factories.hasNext()) {
-      return factories.next().create(containerConfig);
+    SpiContainerFactory factory = XBootstrapService.containerFactory();
+    if (factory == null) {
+      throw new IllegalStateException("Service loader didn't find a SpiContainerFactory?");
    }
-    throw new IllegalStateException("Service loader didn't find a SpiContainerFactory?");
+    return factory.create(containerConfig);
  }
 }
@@ -5,6 +5,8 @@ import java.util.List;
 import java.util.concurrent.Future;

 /**
+ * @deprecated migrate to using {@link PagedList#emptyList()} only.
+ * <p>
 * An empty PagedList.
 * <p>
 * For use in application code when we need to return a PagedList but don't want to
@@ -17,7 +19,8 @@ import java.util.concurrent.Future;
 *
 * }</pre>
 */
-public class EmptyPagedList<T> implements PagedList<T> {
+@Deprecated(forRemoval = true)
+public final class EmptyPagedList<T> implements PagedList<T> {

  @Override
  public void loadCount() {
@@ -84,7 +84,7 @@ public interface FetchGroup<T> {
   * @return The FetchGroup with the given select clause
   */
  static <T> FetchGroup<T> of(Class<T> cls, String select) {
-    return XServiceProvider.fetchGroupOf(cls, select);
+    return XBootstrapService.fetchGroupOf(cls, select);
  }

  /**
@@ -108,14 +108,14 @@ public interface FetchGroup<T> {
   * @return The FetchGroupBuilder with the given select clause which we will add fetch clauses to
   */
  static <T> FetchGroupBuilder<T> of(Class<T> cls) {
-    return XServiceProvider.fetchGroupOf(cls);
+    return XBootstrapService.fetchGroupOf(cls);
  }

  /**
   * Return a query to be used by query beans for constructing FetchGroup.
   */
  static <T> SpiFetchGroupQuery<T> queryFor(Class<T> beanType) {
-    return XServiceProvider.fetchGroupQueryFor(beanType);
+    return XBootstrapService.fetchGroupQueryFor(beanType);
  }

 }
@@ -8,13 +8,11 @@ import java.util.Objects;
 /**
 * Represents an Order By for a Query.
 * <p>
- * Is a ordered list of OrderBy.Property objects each specifying a property and
+ * Is an ordered list of OrderBy.Property objects each specifying a property and
 * whether it is ascending or descending order.
- * </p>
 * <p>
- * Typically you will not construct an OrderBy yourself but use one that exists
+ * Typically, you will not construct an OrderBy yourself but use one that exists
 * on the Query object.
- * </p>
 */
 public class OrderBy<T> implements Serializable {

@@ -25,8 +23,22 @@ public class OrderBy<T> implements Serializable {
  private final List<Property> list;

  /**
+   * Create an OrderBy parsing the given order by clause.
+   * <p>
+   * The order by clause follows SQL order by clause with comma's between each
+   * property and optionally "asc" or "desc" to represent ascending or
+   * descending order respectively.
+   */
+  public static <P> OrderBy<P> of(String orderByClause) {
+    return new OrderBy<>(orderByClause);
+  }
+
+  /**
+   * @deprecated This method will be removed from public API.
+   * <p>
   * Create an empty OrderBy with no associated query.
   */
+  @Deprecated(forRemoval = true)
  public OrderBy() {
    this.list = new ArrayList<>(3);
  }
@@ -36,20 +48,17 @@ public class OrderBy<T> implements Serializable {
  }

  /**
-   * Create an orderBy parsing the order by clause.
-   * <p>
-   * The order by clause follows SQL order by clause with comma's between each
-   * property and optionally "asc" or "desc" to represent ascending or
-   * descending order respectively.
-   * </p>
+   * @deprecated migrate to {@link OrderBy#of(String)}.
   */
+  @Deprecated(forRemoval = true)
  public OrderBy(String orderByClause) {
    this(null, orderByClause);
  }

  /**
-   * Construct with a given query and order by clause.
+   * @deprecated This method will be removed from public API.
   */
+  @Deprecated(forRemoval = true)
  public OrderBy(Query<T> query, String orderByClause) {
    this.query = query;
    this.list = new ArrayList<>(3);
@@ -110,8 +119,11 @@ public class OrderBy<T> implements Serializable {
  }

  /**
+   * @deprecated This method will become internal only API.
+   * <p>
   * Return a copy of this OrderBy with the path trimmed.
   */
+  @Deprecated(forRemoval = true)
  public OrderBy<T> copyWithTrim(String path) {
    List<Property> newList = new ArrayList<>(list.size());
    for (Property aList : list) {
@@ -186,15 +198,15 @@ public class OrderBy<T> implements Serializable {
    if (list.isEmpty()) {
      return null;
    }
-    StringBuilder sb = new StringBuilder();
+    var append = new StringAppend();
    for (int i = 0; i < list.size(); i++) {
      Property property = list.get(i);
      if (i > 0) {
-        sb.append(", ");
+        append.append(", ");
      }
-      sb.append(property.toStringFormat());
+      property.toStringFormat(append);
    }
-    return sb.toString();
+    return append.toString();
  }

  @Override
@@ -231,6 +243,55 @@ public class OrderBy<T> implements Serializable {
    return this;
  }

+  /**
+   * Append the order by clause.
+   */
+  public interface Append {
+
+    /**
+     * Append a property expression.
+     */
+    Append property(String property);
+
+    /**
+     * Append a literal.
+     */
+    Append append(String literal);
+
+    /**
+     * Parse and append an expression.
+     */
+    Append parse(String expression);
+  }
+
+  private static final class StringAppend implements Append {
+
+    private final StringBuilder builder = new StringBuilder();
+
+    @Override
+    public String toString() {
+      return builder.toString();
+    }
+
+    @Override
+    public Append property(String property) {
+      builder.append(property);
+      return this;
+    }
+
+    @Override
+    public Append append(String literal) {
+      builder.append(literal);
+      return this;
+    }
+
+    @Override
+    public Append parse(String raw) {
+      builder.append(raw);
+      return this;
+    }
+  }
+
  /**
   * A property and its ascending descending order.
   */
@@ -309,36 +370,25 @@ public class OrderBy<T> implements Serializable {

    @Override
    public String toString() {
-      return toStringFormat();
+      return property;
    }

-    public String toStringFormat() {
-      if (nulls == null && collation == null) {
-        if (ascending) {
-          return property;
+    public void toStringFormat(Append append) {
+      if (collation != null)  {
+        if (collation.contains("${}")) {
+          // this is a complex collation, e.g. DB2 - we must replace the property
+          append.parse(collation.replace("${}", property));
        } else {
-          return property + " desc";
+          append.property(property).append(" collate ").append(collation);
        }
      } else {
-        StringBuilder sb = new StringBuilder();
-        if (collation != null)  {
-          if (collation.contains("${}")) {
-            // this is a complex collation, e.g. DB2 - we must replace the property
-            sb.append(collation.replace("${}", property));
-          } else {
-            sb.append(property);
-            sb.append(" collate ").append(collation);
-          }
-        } else {
-          sb.append(property);
-        }
-        if (!ascending) {
-          sb.append(' ').append("desc");
-        }
-        if (nulls != null) {
-          sb.append(' ').append(nulls).append(' ').append(highLow);
-        }
-        return sb.toString();
+        append.property(property);
+      }
+      if (!ascending) {
+        append.append(" desc");
+      }
+      if (nulls != null) {
+        append.append(" ").append(nulls).append(" ").append(highLow);
      }
    }

@@ -0,0 +1,90 @@
+package io.ebean;
+
+import io.avaje.lang.Nullable;
+
+/**
+ * Used to specify Paging on a Query as an alternative to setting each of the
+ * maxRows, firstRow and orderBy clause via:
+ * {@link Query#setMaxRows(int)} + {@link Query#setFirstRow(int)} + {@link Query#setOrderBy(OrderBy)}.
+ * <p>
+ * Example use:
+ *
+ * <pre>{@code
+ *
+ *   var orderBy = OrderBy.of("lastName desc nulls first, firstName asc");
+ *   var paging = Paging.of(0, 100, orderBy);
+ *
+ *   new QCustomer()
+ *       .name.isNotNull()
+ *       .setPaging(paging)
+ *       .findList();
+ *
+ * }</pre>
+ */
+public interface Paging {
+
+  /**
+   * Create a Paging with the given page index size and orderBy.
+   *
+   * @param pageIndex the page index starting from zero
+   * @param pageSize  the page size (effectively max rows)
+   * @param orderBy   order by for the query result
+   */
+  static Paging of(int pageIndex, int pageSize, @Nullable OrderBy<?> orderBy) {
+    return DPaging.build(pageIndex, pageSize, orderBy);
+  }
+
+  /**
+   * Create a Paging with a raw order by clause.
+   *
+   * @param pageIndex     the page index starting from zero
+   * @param pageSize      the page size (effectively max rows)
+   * @param orderByClause raw order by clause for ordering the query result
+   */
+  static Paging of(int pageIndex, int pageSize, @Nullable String orderByClause) {
+    return of(pageIndex, pageSize, OrderBy.of(orderByClause));
+  }
+
+  /**
+   * Create a Paging that will use the id property for ordering.
+   *
+   * @param pageIndex the page index starting from zero
+   * @param pageSize  the page size (effectively max rows)
+   */
+  static Paging of(int pageIndex, int pageSize) {
+    return DPaging.build(pageIndex, pageSize);
+  }
+
+  /**
+   * Return a Paging that will not apply any pagination to a query.
+   */
+  static Paging ofNone() {
+    return DPaging.NONE;
+  }
+
+  /**
+   * Return the page index.
+   */
+  int pageIndex();
+
+  /**
+   * Return the page size.
+   */
+  int pageSize();
+
+  /**
+   * Return the order by.
+   */
+  OrderBy<?> orderBy();
+
+  /**
+   * Return a Paging using the given page index.
+   */
+  Paging withPage(int pageIndex);
+
+  /**
+   * Return a Paging using the given order by clause.
+   */
+  Paging withOrderBy(String orderByClause);
+
+}
@@ -13,21 +13,21 @@ public interface ProfileLocation {
   * Create and return a new ProfileLocation.
   */
  static ProfileLocation create() {
-    return XServiceProvider.profileLocationFactory().create();
+    return XBootstrapService.profileLocationFactory().create();
  }

  /**
   * Create and return a new ProfileLocation with line number.
   */
  static ProfileLocation createWithLine() {
-    return XServiceProvider.profileLocationFactory().createWithLine();
+    return XBootstrapService.profileLocationFactory().createWithLine();
  }

  /**
   * Create and return a new ProfileLocation with a given lineNumber and label.
   */
  static ProfileLocation create(String label) {
-    return XServiceProvider.profileLocationFactory().create(label);
+    return XBootstrapService.profileLocationFactory().create(label);
  }

  /**
@@ -27,6 +27,13 @@ public interface QueryBuilder<SELF, T> extends QueryBuilderProjection<SELF, T> {
   */
  SELF alias(String alias);

+  /**
+   * Apply changes to the query using a function.
+   *
+   * @param apply Function that applies changes to the query.
+   */
+  SELF also(Consumer<SELF> apply);
+
  /**
   * Apply changes to the query conditional on the supplied predicate.
   * <p>
@@ -317,6 +324,8 @@ public interface QueryBuilder<SELF, T> extends QueryBuilderProjection<SELF, T> {
   */
  SELF setMaxRows(int maxRows);

+  SELF setPaging(Paging paging);
+
  /**
   * Set RawSql to use for this query.
   */
@@ -40,6 +40,13 @@ public interface QueryBuilderProjection<SELF, T> {
   */
  SELF select(String fetchProperties);

+  /**
+   * Set DISTINCT ON clause. This is a Postgres only SQL feature.
+   *
+   * @param distinctOn The properties to include in the DISTINCT ON clause.
+   */
+  SELF distinctOn(String distinctOn);
+
  /**
   * Apply the fetchGroup which defines what part of the object graph to load.
   */
@@ -22,14 +22,14 @@ public interface RawSqlBuilder {
   * resultSet.
   */
  static RawSql resultSet(ResultSet resultSet, String... propertyNames) {
-    return XServiceProvider.rawSql().resultSet(resultSet, propertyNames);
+    return XBootstrapService.rawSql().resultSet(resultSet, propertyNames);
  }

  /**
   * Create and return a SqlRow based on the resultSet with dbTrueValue and binaryOptimizedUUID options.
   */
  static SqlRow sqlRow(ResultSet resultSet, final String dbTrueValue, boolean binaryOptimizedUUID) throws SQLException {
-    return XServiceProvider.rawSql().sqlRow(resultSet, dbTrueValue, binaryOptimizedUUID);
+    return XBootstrapService.rawSql().sqlRow(resultSet, dbTrueValue, binaryOptimizedUUID);
  }

  /**
@@ -38,7 +38,7 @@ public interface RawSqlBuilder {
   * this query.
   */
  static RawSqlBuilder unparsed(String sql) {
-    return XServiceProvider.rawSql().unparsed(sql);
+    return XBootstrapService.rawSql().unparsed(sql);
  }

  /**
@@ -55,7 +55,7 @@ public interface RawSqlBuilder {
   * </p>
   */
  static RawSqlBuilder parse(String sql) {
-    return XServiceProvider.rawSql().parsed(sql);
+    return XBootstrapService.rawSql().parsed(sql);
  }

  /**
@@ -0,0 +1,95 @@
+package io.ebean;
+
+import io.ebean.metric.MetricFactory;
+import io.ebean.service.*;
+
+import java.util.ServiceLoader;
+
+/**
+ * Bootstrap internal services.
+ */
+public final class XBootstrapService {
+
+  private static final SpiContainerFactory containerFactory;
+  private static final SpiRawSqlService rawSqlService;
+  private static final SpiProfileLocationFactory profileLocationFactory;
+  private static final SpiFetchGroupService fetchGroupService;
+  private static final MetricFactory metricFactory;
+  private static final SpiJsonService jsonService;
+  static {
+    SpiContainerFactory _factory = null;
+    SpiRawSqlService _raw = null;
+    SpiProfileLocationFactory _profile = null;
+    SpiFetchGroupService _fetch = null;
+    MetricFactory _metric = null;
+    SpiJsonService _json = null;
+    for (BootstrapService extension : ServiceLoader.load(BootstrapService.class)) {
+      if (extension instanceof SpiContainerFactory) {
+        _factory = (SpiContainerFactory)extension;
+      } else if (extension instanceof SpiRawSqlService) {
+        _raw = (SpiRawSqlService)extension;
+      } else if (extension instanceof SpiProfileLocationFactory) {
+        _profile = (SpiProfileLocationFactory)extension;
+      } else if (extension instanceof SpiFetchGroupService) {
+        _fetch = (SpiFetchGroupService)extension;
+      } else if (extension instanceof MetricFactory) {
+        _metric = (MetricFactory)extension;
+      } else if (extension instanceof SpiJsonService) {
+        _json = (SpiJsonService)extension;
+      }
+    }
+    containerFactory = _factory;
+    rawSqlService = _raw;
+    profileLocationFactory = _profile;
+    fetchGroupService = _fetch;
+    metricFactory = _metric;
+    jsonService = _json;
+  }
+
+  /**
+   * Return the MetricFactory found in boostrap service loading.
+   */
+  public static MetricFactory metricFactory() {
+    return metricFactory;
+  }
+
+  /**
+   * Return the SpiJsonService found in boostrap service loading.
+   */
+  public static SpiJsonService jsonService() {
+    return jsonService;
+  }
+
+  static SpiContainerFactory containerFactory() {
+    return containerFactory;
+  }
+
+  static SpiRawSqlService rawSql() {
+    return rawSqlService;
+  }
+
+  static SpiProfileLocationFactory profileLocationFactory() {
+    return profileLocationFactory;
+  }
+
+  /**
+   * Return the FetchGroup with the given select clause.
+   */
+  static <T> FetchGroup<T> fetchGroupOf(Class<T> cls, String select) {
+    return fetchGroupService.of(cls, select);
+  }
+
+  /**
+   * Return the FetchGroupBuilder with the given select clause.
+   */
+  static <T> FetchGroupBuilder<T> fetchGroupOf(Class<T> cls) {
+    return fetchGroupService.of(cls);
+  }
+
+  /**
+   * Return the FetchGroup Query for building fetch groups via query beans.
+   */
+  static <T> SpiFetchGroupQuery<T> fetchGroupQueryFor(Class<T> cls) {
+    return fetchGroupService.queryFor(cls);
+  }
+}
@@ -1,76 +0,0 @@
-package io.ebean;
-
-import io.ebean.service.SpiFetchGroupQuery;
-import io.ebean.service.SpiFetchGroupService;
-import io.ebean.service.SpiProfileLocationFactory;
-import io.ebean.service.SpiRawSqlService;
-
-import java.util.Iterator;
-import java.util.ServiceLoader;
-
-/**
- * Lookup internal services.
- */
-final class XServiceProvider {
-
-  private static SpiRawSqlService rawSqlService = initRawSql();
-
-  private static SpiProfileLocationFactory profileLocationFactory = initProfileLocation();
-
-  private static SpiFetchGroupService fetchGroupService = initSpiFetchGroupService();
-
-  private static SpiFetchGroupService initSpiFetchGroupService() {
-    return loadFirstService(SpiFetchGroupService.class);
-  }
-
-  private static SpiRawSqlService initRawSql() {
-    return loadFirstService(SpiRawSqlService.class);
-  }
-
-  private static SpiProfileLocationFactory initProfileLocation() {
-    return loadFirstService(SpiProfileLocationFactory.class);
-  }
-
-  private static <T> T loadFirstService(Class<T> cls) {
-    Iterator<T> loader = ServiceLoader.load(cls).iterator();
-    if (loader.hasNext()) {
-      return loader.next();
-    }
-    throw new IllegalStateException("No service implementation found for " + cls);
-  }
-
-  /**
-   * Return the RawSqlService implementation.
-   */
-  static SpiRawSqlService rawSql() {
-    return rawSqlService;
-  }
-
-  /**
-   * Return the RawSqlService implementation.
-   */
-  static SpiProfileLocationFactory profileLocationFactory() {
-    return profileLocationFactory;
-  }
-
-  /**
-   * Return the FetchGroup with the given select clause.
-   */
-  static <T> FetchGroup<T> fetchGroupOf(Class<T> cls, String select) {
-    return fetchGroupService.of(cls, select);
-  }
-
-  /**
-   * Return the FetchGroupBuilder with the given select clause.
-   */
-  static <T> FetchGroupBuilder<T> fetchGroupOf(Class<T> cls) {
-    return fetchGroupService.of(cls);
-  }
-
-  /**
-   * Return the FetchGroup Query for building fetch groups via query beans.
-   */
-  static <T> SpiFetchGroupQuery<T> fetchGroupQueryFor(Class<T> cls) {
-    return fetchGroupService.queryFor(cls);
-  }
-}
@@ -129,7 +129,7 @@ public class DatabaseConfig implements DatabaseBuilder.Settings {
   * When true then include a sql comment in generated SELECT queries with the query
   * label or profile location label.
   */
-  private boolean includeLabelInSql;
+  private boolean includeLabelInSql = true;

  /**
   * Interesting classes such as entities, embedded, ScalarTypes,
@@ -4,22 +4,8 @@ public final class AnsiSqlRowsLimiter implements SqlLimiter {

  @Override
  public SqlLimitResponse limit(SqlLimitRequest request) {
-    String dbSql = request.getDbSql();
-    StringBuilder sb = new StringBuilder(50 + dbSql.length());
-    sb.append("select ");
-    if (request.isDistinct()) {
-      sb.append("distinct ");
-    }
-    sb.append(dbSql);
-    int firstRow = request.getFirstRow();
-    if (firstRow > 0) {
-      sb.append(" offset ").append(firstRow).append(" rows");
-    }
-    int maxRows = request.getMaxRows();
-    if (maxRows > 0) {
-      sb.append(" fetch next ").append(maxRows).append(" rows only");
-    }
-    String sql = request.getDbPlatform().completeSql(sb.toString(), request.getOrmQuery());
+    final var ansiSql = request.ansiOffsetRows();
+    final var sql = request.getDbPlatform().completeSql(ansiSql, request.getOrmQuery());
    return new SqlLimitResponse(sql);
  }
 }
@@ -199,21 +199,12 @@ public class DatabasePlatform {

  protected SqlExceptionTranslator exceptionTranslator = new SqlCodeTranslator();

-  protected InsertSqlSyntaxExtension insertSqlSyntaxExtension = new StandardInsertSqlSyntax();
-
  /**
   * Instantiates a new database platform.
   */
  public DatabasePlatform() {
  }

-  /**
-   * Return the Insert SQL syntax helper.
-   */
-  public InsertSqlSyntaxExtension insertSqlSyntaxExtension() {
-    return insertSqlSyntaxExtension;
-  }
-
  /**
   * Translate the SQLException into a specific persistence exception if possible.
   */
@@ -1,32 +0,0 @@
-package io.ebean.config.dbplatform;
-
-/**
- * Insert SQL syntax to allow support for ClickHouse type optimisation for inserts.
- */
-public interface InsertSqlSyntaxExtension {
-
-  /**
-   * Start the columns.
-   */
-  String startColumns();
-
-  /**
-   * End of the columns.
-   */
-  String endColumns();
-
-  /**
-   * Return true for insert to use standard binding.
-   */
-  boolean useBinding();
-
-  /**
-   * Start types for non-standard binding (e.g. ClickHouse).
-   */
-  String startTypes();
-
-  /**
-   * End types for non-standard binding (e.g. ClickHouse).
-   */
-  String endTypes();
-}
@@ -7,23 +7,16 @@ public final class LimitOffsetSqlLimiter implements SqlLimiter {

  @Override
  public SqlLimitResponse limit(SqlLimitRequest request) {
-    String dbSql = request.getDbSql();
-    StringBuilder sb = new StringBuilder(50 + dbSql.length());
-    sb.append("select ");
-    if (request.isDistinct()) {
-      sb.append("distinct ");
-    }
-    sb.append(dbSql);
+    final var buffer = request.selectDistinctOnSql();
    int maxRows = request.getMaxRows();
    if (maxRows > 0) {
-      sb.append(" limit ").append(maxRows);
+      buffer.append(" limit ").append(maxRows);
    }
    int firstRow = request.getFirstRow();
    if (firstRow > 0) {
-      sb.append(" offset ").append(firstRow);
+      buffer.append(" offset ").append(firstRow);
    }
-    String sql = request.getDbPlatform().completeSql(sb.toString(), request.getOrmQuery());
-    return new SqlLimitResponse(sql);
+    return new SqlLimitResponse(request.getDbPlatform().completeSql(buffer.toString(), request.getOrmQuery()));
  }

 }
@@ -8,6 +8,21 @@ import io.ebean.Query;
 */
 public interface SqlLimitRequest {

+  /**
+   * Return ANSI SQL Offset and next rows.
+   */
+  String ansiOffsetRows();
+
+  /**
+   * Create and return buffer including the select distinct clause.
+   */
+  StringBuilder selectDistinct();
+
+  /**
+   * Create and return buffer including the select distinct on clause.
+   */
+  StringBuilder selectDistinctOnSql();
+
  /**
   * Return true if the query uses distinct.
   */
@@ -1,32 +0,0 @@
-package io.ebean.config.dbplatform;
-
-/**
- * Standard Insert SQL syntax.
- */
-public final class StandardInsertSqlSyntax implements InsertSqlSyntaxExtension {
-
-  @Override
-  public String startColumns() {
-    return " (";
-  }
-
-  @Override
-  public String endColumns() {
-    return ") values (";
-  }
-
-  @Override
-  public boolean useBinding() {
-    return true;
-  }
-
-  @Override
-  public String startTypes() {
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public String endTypes() {
-    throw new IllegalStateException();
-  }
-}
@@ -1,17 +1,19 @@
 package io.ebean.metric;

 import io.ebean.ProfileLocation;
+import io.ebean.XBootstrapService;
+import io.ebean.service.BootstrapService;

 /**
 * Factory to create timed metric counters.
 */
-public interface MetricFactory {
+public interface MetricFactory extends BootstrapService {

  /**
   * Return the factory instance.
   */
  static MetricFactory get() {
-    return MetricServiceProvider.get();
+    return XBootstrapService.metricFactory();
  }

  /**
@@ -1,28 +0,0 @@
-package io.ebean.metric;
-
-import java.util.Iterator;
-import java.util.ServiceLoader;
-
-/**
- * Lookup MetricFactory service.
- */
-final class MetricServiceProvider {
-
-  private static final MetricFactory metricFactory = init();
-
-  private static MetricFactory init() {
-    Iterator<MetricFactory> loader = ServiceLoader.load(MetricFactory.class).iterator();
-    if (loader.hasNext()) {
-      return loader.next();
-    }
-    throw new IllegalStateException("MetricFactory not service loaded?");
-  }
-
-  /**
-   * Return the MetricFactory implementation.
-   */
-  static MetricFactory get() {
-    return metricFactory;
-  }
-
-}
@@ -0,0 +1,7 @@
+package io.ebean.service;
+
+/**
+ * Marker interface for internal services loaded at startup.
+ */
+public interface BootstrapService {
+}
@@ -5,7 +5,7 @@ import io.ebean.config.ContainerConfig;
 /**
 * Provides shutdown of the entire container.
 */
-public interface SpiContainerFactory {
+public interface SpiContainerFactory extends BootstrapService {

  /**
   * Create the Container that builds EbeanServer instances.
@@ -6,7 +6,7 @@ import io.ebean.FetchGroupBuilder;
 /**
 * Service that parses FetchGroup expressions.
 */
-public interface SpiFetchGroupService {
+public interface SpiFetchGroupService extends BootstrapService {

  /**
   * Return the FetchGroup with the given select clause.
@@ -17,7 +17,7 @@ import java.util.Set;
 *
 * Supports converting between JSON content and simple java Maps/Lists.
 */
-public interface SpiJsonService {
+public interface SpiJsonService extends BootstrapService {

  /**
   * Write the nested Map/List as json.
@@ -5,7 +5,7 @@ import io.ebean.ProfileLocation;
 /**
 * Factory for creating profile locations.
 */
-public interface SpiProfileLocationFactory {
+public interface SpiProfileLocationFactory extends BootstrapService {

  /**
   * Create a profile location.
@@ -10,7 +10,7 @@ import java.sql.SQLException;
 /**
 * Service provided by Ebean for parsing and column mapping raw SQL queries.
 */
-public interface SpiRawSqlService {
+public interface SpiRawSqlService extends BootstrapService {

  /**
   * Create based on a JDBC ResultSet.
@@ -3,16 +3,15 @@ package io.ebean.text.json;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
+import io.ebean.XBootstrapService;
 import io.ebean.service.SpiJsonService;

 import java.io.IOException;
 import java.io.Reader;
 import java.io.Writer;
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.ServiceLoader;
 import java.util.Set;

 /**
@@ -20,16 +19,7 @@ import java.util.Set;
 */
 public class EJson {

-  private static SpiJsonService plugin = init();
-
-  private static SpiJsonService init() {
-
-    Iterator<SpiJsonService> loader = ServiceLoader.load(SpiJsonService.class).iterator();
-    if (loader.hasNext()) {
-      return loader.next();
-    }
-    throw new IllegalStateException("No service implementation found for SpiJsonService?");
-  }
+  private static final SpiJsonService plugin = XBootstrapService.jsonService();

  /**
   * Write the nested Map/List as json.
@@ -1,13 +1,9 @@
 module io.ebean.api {

  uses io.ebean.config.AutoConfigure;
-  uses io.ebean.config.dbplatform.DatabasePlatformProvider;
  uses io.ebean.datasource.DataSourceAlertFactory;
-  uses io.ebean.metric.MetricFactory;
-  uses io.ebean.service.SpiContainerFactory;
-  uses io.ebean.service.SpiRawSqlService;
-  uses io.ebean.service.SpiProfileLocationFactory;
-  uses io.ebean.service.SpiFetchGroupService;
+  uses io.ebean.service.BootstrapService;
+  uses io.ebean.service.SpiJsonService;

  requires transitive java.sql;
  requires transitive io.avaje.config;
@@ -1 +1 @@
-ebean-version: 143
+ebean-version: 145
@@ -76,7 +76,7 @@ class DatabaseConfigTest {
    props.setProperty("skipDataSourceCheck", "true");
    props.setProperty("readOnlyDatabase", "true");
    props.setProperty("lengthCheck", "ON");
-    props.setProperty("includeLabelInSql", "true");
+    props.setProperty("includeLabelInSql", "false");

    props.setProperty("queryPlan.enable", "true");
    props.setProperty("queryPlan.thresholdMicros", "10000");
@@ -97,7 +97,7 @@ class DatabaseConfigTest {
    assertTrue(settings.isLoadModuleInfo());
    assertTrue(settings.skipDataSourceCheck());
    assertTrue(settings.readOnlyDatabase());
-    assertTrue(settings.isIncludeLabelInSql());
+    assertFalse(settings.isIncludeLabelInSql());
    assertThat(settings.getLengthCheck()).isEqualTo(LengthCheck.ON);

    assertTrue(settings.isIdGeneratorAutomatic());
@@ -183,7 +183,7 @@ class DatabaseConfigTest {
    assertEquals(10000L, config.getQueryPlanCaptureMaxTimeMillis());
    assertEquals(10, config.getQueryPlanCaptureMaxCount());
    assertThat(config.getLengthCheck()).isEqualTo(LengthCheck.OFF);
-    assertFalse(config.isIncludeLabelInSql());
+    assertTrue(config.isIncludeLabelInSql());

    config.setLoadModuleInfo(false);
    assertFalse(config.isAutoLoadModuleInfo());
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>14.6.0</version>
  </parent>

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

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-api</artifactId>
-        <version>14.1.0</version>
+        <version>14.6.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-core</artifactId>
-        <version>14.1.0</version>
+        <version>14.6.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-core-type</artifactId>
-        <version>14.1.0</version>
+        <version>14.6.0</version>
      </dependency>

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

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-ddl-generator</artifactId>
-        <version>14.1.0</version>
+        <version>14.6.0</version>
      </dependency>

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

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>querybean-generator</artifactId>
-        <version>14.1.0</version>
+        <version>14.6.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>kotlin-querybean-generator</artifactId>
-        <version>14.1.0</version>
+        <version>14.6.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-test</artifactId>
-        <version>14.1.0</version>
+        <version>14.6.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-redis</artifactId>
-        <version>14.1.0</version>
+        <version>14.6.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-spring-txn</artifactId>
-        <version>14.1.0</version>
+        <version>14.6.0</version>
      </dependency>

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

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-db2</artifactId>
-        <version>14.1.0</version>
+        <version>14.6.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-h2</artifactId>
-        <version>14.1.0</version>
+        <version>14.6.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-hana</artifactId>
-        <version>14.1.0</version>
+        <version>14.6.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-mariadb</artifactId>
-        <version>14.1.0</version>
+        <version>14.6.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-mysql</artifactId>
-        <version>14.1.0</version>
+        <version>14.6.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-nuodb</artifactId>
-        <version>14.1.0</version>
+        <version>14.6.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-oracle</artifactId>
-        <version>14.1.0</version>
+        <version>14.6.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-postgres</artifactId>
-        <version>14.1.0</version>
+        <version>14.6.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-postgis</artifactId>
-        <version>14.1.0</version>
+        <version>14.6.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-postgis-types</artifactId>
-        <version>14.1.0</version>
+        <version>14.6.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-sqlite</artifactId>
-        <version>14.1.0</version>
+        <version>14.6.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-sqlserver</artifactId>
-        <version>14.1.0</version>
+        <version>14.6.0</version>
      </dependency>

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

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

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

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

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

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

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

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

@@ -211,6 +211,7 @@
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-surefire-plugin</artifactId>
        <configuration>
+          <argLine>-Dnet.bytebuddy.experimental=true</argLine>
          <useSystemClassLoader>false</useSystemClassLoader>
          <trimStackTrace>false</trimStackTrace>
          <failIfNoTests>false</failIfNoTests>
@@ -84,10 +84,17 @@ public final class LoadBeanRequest extends LoadRequest {
    return idList;
  }

+  public SpiQuery<?> createQuery(SpiEbeanServer server) {
+    final SpiQuery<?> query = server.createQuery(beanType());
+    query.usingTransaction(transaction);
+    configureQuery(query);
+    return query;
+  }
+
  /**
   * Configure the query for lazy loading execution.
   */
-  public void configureQuery(SpiQuery<?> query) {
+  private void configureQuery(SpiQuery<?> query) {
    query.setMode(Mode.LAZYLOAD_BEAN);
    query.setPersistenceContext(loadBuffer.persistenceContext());
    query.setLoadDescription(mode(), description());
@@ -94,6 +94,7 @@ public final class LoadManyRequest extends LoadRequest {
  public SpiQuery<?> createQuery(SpiEbeanServer server) {
    BeanPropertyAssocMany<?> many = many();
    SpiQuery<?> query = many.newQuery(server);
+    query.usingTransaction(transaction);
    String orderBy = many.lazyFetchOrderBy();
    if (orderBy != null) {
      query.orderBy(orderBy);
@@ -439,6 +439,11 @@ public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCod
  @Override
  SpiQuery<T> copy();

+  /**
+   * Return the distinct on clause.
+   */
+  String distinctOn();
+
  /**
   * Return a copy of the query attaching to a different EbeanServer.
   */
@@ -549,7 +554,6 @@ public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCod
   * Return true if the query should include the Id property.
   * <p>
   * distinct and single attribute queries exclude the Id property.
-   * </p>
   */
  boolean isWithId();

@@ -576,7 +580,12 @@ public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCod
  /**
   * Convert joins as necessary to query joins etc.
   */
-  SpiQuerySecondary convertJoins();
+  SpiQueryManyJoin convertJoins();
+
+  /**
+   * Return secondary queries if required.
+   */
+  SpiQuerySecondary secondaryQuery();

  /**
   * Return the TransactionContext.
@@ -0,0 +1,22 @@
+package io.ebeaninternal.api;
+
+/**
+ * A SQL Join for a ToMany property included in the query.
+ */
+public interface SpiQueryManyJoin {
+
+  /**
+   * The full path of the many property to include in the query via join.
+   */
+  String path();
+
+  /**
+   * Order by clause defined via mapping on the ToMany property.
+   */
+  String fetchOrderBy();
+
+  /**
+   * Wrap the filter many expression with a condition allowing lEFT JOIN null matching row.
+   */
+  String idNullOr(String filterManyExpression);
+}
@@ -357,4 +357,8 @@ public interface SpiTransaction extends Transaction {
   */
  void postRollback(Throwable cause);

+  /**
+   * Set the transaction to be inactive via external transaction manager.
+   */
+  void deactivateExternal();
 }
@@ -447,4 +447,9 @@ public abstract class SpiTransactionProxy implements SpiTransaction {
  public void postRollback(Throwable cause) {
    transaction.postRollback(cause);
  }
+
+  @Override
+  public void deactivateExternal() {
+    transaction.deactivateExternal();
+  }
 }
@@ -126,9 +126,7 @@ final class DefaultBeanLoader {
    if (loadRequest.checkEmpty()) {
      throw new RuntimeException("Nothing in batch?");
    }
-    final SpiQuery<?> query = server.createQuery(loadRequest.beanType());
-    query.usingTransaction(loadRequest.transaction());
-    loadRequest.configureQuery(query);
+    final SpiQuery<?> query = loadRequest.createQuery(server);
    loadRequest.postLoad(executeQuery(loadRequest, query));
  }

@@ -449,6 +449,9 @@ public final class InternalConfiguration {
   */
  private DataTimeZone initDataTimeZone() {
    String tz = config.getDataTimeZone();
+    if ("NoTimeZone".equals(tz)) {
+      return new NoDataTimeZone();
+    }
    if (tz == null) {
      if (isMySql(getPlatform())) {
        return new MySqlDataTimeZone();
@@ -41,9 +41,9 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
  private CQueryPlanKey queryPlanKey;
  private SpiQuerySecondary secondaryQueries;
  private List<T> cacheBeans;
-  private BeanPropertyAssocMany<?> manyProperty;
  private boolean inlineCountDistinct;
  private Set<String> dependentTables;
+  private SpiQueryManyJoin manyJoin;

  public OrmQueryRequest(SpiEbeanServer server, OrmQueryEngine queryEngine, SpiQuery<T> query, SpiTransaction t) {
    super(server, t);
@@ -168,7 +168,8 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
   */
  @Override
  public void prepareQuery() {
-    secondaryQueries = query.convertJoins();
+    manyJoin = query.convertJoins();
+    secondaryQueries = query.secondaryQuery();
    beanDescriptor.prepareQuery(query);
    adapterPreQuery();
    queryPlanKey = query.prepare(this);
@@ -446,19 +447,19 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
    return query;
  }

-  /**
-   * Determine and return the ToMany property that is included in the query.
-   */
-  public BeanPropertyAssocMany<?> determineMany() {
-    manyProperty = beanDescriptor.manyProperty(query);
-    return manyProperty;
+  public SpiQueryManyJoin manyJoin() {
+    return manyJoin;
  }

  /**
-   * Return the many property that is fetched in the query or null if there is not one.
+   * Return true if there is a manyJoin that should be included with this query.
   */
-  public BeanPropertyAssocMany<?> manyPropertyForOrderBy() {
-    return query.isSingleAttribute() ? null : manyProperty;
+  public boolean includeManyJoin() {
+    if (manyJoin == null || query.isSingleAttribute()) {
+      return false;
+    }
+    final Type type = query.type();
+    return type != Type.SQ_EX && type != Type.COUNT;
  }

  /**
@@ -1601,19 +1601,6 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
    return null;
  }

-  /**
-   * Return the many property included in the query or null if one is not.
-   */
-  public BeanPropertyAssocMany<?> manyProperty(SpiQuery<?> query) {
-    OrmQueryDetail detail = query.detail();
-    for (BeanPropertyAssocMany<?> many : propertiesMany) {
-      if (detail.includesPath(many.name())) {
-        return many;
-      }
-    }
-    return null;
-  }
-
  /**
   * Return a raw expression for 'where parent id in ...' clause.
   */
@@ -514,7 +514,7 @@ final class BeanDescriptorCacheHelp<T> {

    if (natKeys != null && !natKeys.isEmpty()) {
      if (natLog.isLoggable(DEBUG)) {
-        natLog.log(DEBUG, " MPUT {0}({1}, {2})", cacheName, naturalKey, natKeys.keySet());
+        natLog.log(DEBUG, " MPUT {0}({1}, {2})", cacheName, Arrays.toString(naturalKey), natKeys.keySet());
      }
      naturalKeyCache.putAll(natKeys);
    }
@@ -5,7 +5,6 @@ import io.ebean.DatabaseBuilder;
 import io.ebean.Model;
 import io.ebean.RawSqlBuilder;
 import io.ebean.annotation.ConstraintMode;
-import io.ebean.annotation.Platform;
 import io.ebean.bean.BeanCollection;
 import io.ebean.bean.EntityBean;
 import io.ebean.config.*;
@@ -633,8 +632,6 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
  }

  private void registerDescriptor(DeployBeanInfo<?> info) {
-    platformUsesColumnDefinitions(info);
-
    BeanDescriptor<?> desc = new BeanDescriptor<>(this, info.getDescriptor());
    descMap.put(desc.type().getName(), desc);
    if (desc.isDocStoreMapped()) {
@@ -647,23 +644,6 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
    }
  }

-  private void platformUsesColumnDefinitions(DeployBeanInfo<?> info) {
-    if (databasePlatform.isPlatform(Platform.CLICKHOUSE) && !DbOffline.isGenerateMigration()) {
-      // ClickHouse uses column definition to optimise JDBC bulk inserts
-      DbPlatformTypeMapping typeMapping = databasePlatform.dbTypeMap();
-      for (DeployBeanProperty property : info.getDescriptor().propertiesAll()) {
-        if (property.getDbColumnDefn() == null) {
-          DbPlatformType dbPlatformType = typeMapping.get(property.getDbType());
-          String columnDefn = dbPlatformType.renderType(property.getDbLength(), property.getDbScale());
-          if (property.isNullable()) {
-            columnDefn = "Nullable(" + columnDefn + ")";
-          }
-          property.setDbColumnDefn(columnDefn);
-        }
-      }
-    }
-  }
-
  /**
   * Read the initial deployment information for the entities.
   * <p>
@@ -36,6 +36,11 @@ public final class BeanFkeyProperty implements ElPropertyValue {
    return "prefix:" + prefix + " name:" + name + " dbColumn:" + dbColumn + " ph:" + placeHolder;
  }

+  @Override
+  public String idNullOr(String filterManyExpression) {
+    throw new UnsupportedOperationException();
+  }
+
  @Override
  public boolean isAggregation() {
    return false;
@@ -512,6 +512,11 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
    return owningType.isAssignableFrom(type);
  }

+  @Override
+  public String idNullOr(String filterManyExpression) {
+    throw new UnsupportedOperationException();
+  }
+
  @Override
  public void loadIgnore(DbReadContext ctx) {
    ctx.dataReader().incrementPos(1);
@@ -634,6 +634,11 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
    return fetchOrderBy;
  }

+  @Override
+  public String idNullOr(String filterManyExpression) {
+    return targetIdBinder.idNullOr(name, filterManyExpression);
+  }
+
  /**
   * Return the order by for use when lazy loading the associated collection.
   */
@@ -27,6 +27,11 @@ public interface IdBinder {
   */
  void initialise();

+  /**
+   * Wrap the filter many expression with a condition allowing lEFT JOIN null matching row.
+   */
+  String idNullOr(String name, String filterManyExpression);
+
  String idSelect();

  /**
@@ -46,6 +46,20 @@ public final class IdBinderEmbedded implements IdBinder {
    this.idInValueSql = idInExpandedForm ? idInExpanded() : idInCompressed();
  }

+  @Override
+  public String idNullOr(String prefix, String filterManyExpression) {
+    StringBuilder sb = new StringBuilder(100);
+    sb.append("((");
+    for (int i = 0; i < props.length; i++) {
+      if (i > 0) {
+        sb.append(" and ");
+      }
+      sb.append("${").append(prefix).append('.').append(embIdProperty.name()).append('}').append(props[i].name()).append(" is null");
+    }
+    sb.append(") or (").append(filterManyExpression).append("))");
+    return sb.toString();
+  }
+
  @Override
  public String idSelect() {
    return embIdProperty.name();
@@ -28,6 +28,11 @@ final class IdBinderEmpty implements IdBinder {
  public void initialise() {
  }

+  @Override
+  public String idNullOr(String name, String filterManyExpression) {
+    throw new UnsupportedOperationException();
+  }
+
  @Override
  public String idSelect() {
    return "";
@@ -260,4 +260,9 @@ public final class IdBinderSimple implements IdBinder {
    final Object value = idProperty.getValue(bean);
    return scalarType.format(value);
  }
+
+  @Override
+  public String idNullOr(String prefix, String filterManyExpression) {
+    return "(${" + prefix + "}" + idProperty.name() + " is null or (" + filterManyExpression + "))";
+  }
 }
@@ -43,11 +43,6 @@ public interface ImportedId {
   */
  void dmlAppend(GenerateDmlRequest request);

-  /**
-   * Append column and type for Insert (ClickHouse).
-   */
-  void dmlType(GenerateDmlRequest request);
-
  /**
   * Bind the value from the bean.
   */
@@ -66,16 +66,6 @@ public final class ImportedIdEmbedded implements ImportedId {
    }
  }

-  @Override
-  public void dmlType(GenerateDmlRequest request) {
-    boolean update = request.isUpdate();
-    for (ImportedIdSimple anImported : imported) {
-      if (anImported.isInclude(update)) {
-        anImported.dmlType(request);
-      }
-    }
-  }
-
  @Override
  public String importedIdClause() {
    StringBuilder sb = new StringBuilder();
@@ -37,7 +37,6 @@ public final class ImportedIdSimple implements ImportedId, Comparable<ImportedId

  final BeanPropertyAssoc<?> owner;
  final String localDbColumn;
-  private final String localColumnDefn;
  private final String localSqlFormula;
  final BeanProperty foreignProperty;
  private final int position;
@@ -50,7 +49,6 @@ public final class ImportedIdSimple implements ImportedId, Comparable<ImportedId
    this.localDbColumn = InternString.intern(localDbColumn);
    this.localSqlFormula = InternString.intern(localSqlFormula);
    this.foreignProperty = foreignProperty;
-    this.localColumnDefn = foreignProperty.dbColumnDefn();
    this.position = position;
    this.insertable = insertable;
    this.updateable = updateable;
@@ -145,11 +143,6 @@ public final class ImportedIdSimple implements ImportedId, Comparable<ImportedId
    request.appendColumn(localDbColumn);
  }

-  @Override
-  public void dmlType(GenerateDmlRequest request) {
-    request.appendColumnDefn(localDbColumn, localColumnDefn);
-  }
-
  @Override
  public String importedIdClause() {
    return localDbColumn + " = ?";
@@ -286,4 +286,8 @@ public final class ElPropertyChain implements ElPropertyValue {
    }
  }

+  @Override
+  public String idNullOr(String filterManyExpression) {
+    throw new UnsupportedOperationException();
+  }
 }
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.el;

+import io.ebeaninternal.api.SpiQueryManyJoin;
 import io.ebeaninternal.server.deploy.BeanProperty;

 /**
@@ -10,7 +11,7 @@ import io.ebeaninternal.server.deploy.BeanProperty;
 * joins and set place holders for table alias'.
 * </p>
 */
-public interface ElPropertyDeploy {
+public interface ElPropertyDeploy extends SpiQueryManyJoin {

  /**
   * This is the elPrefix for all root level properties.
@@ -80,4 +81,14 @@ public interface ElPropertyDeploy {
   * is left as a 'join' and which get converted to query join.
   */
  int fetchPreference();
+
+  @Override
+  default String path() {
+    return elName();
+  }
+
+  @Override
+  default String fetchOrderBy() {
+    return beanProperty().fetchOrderBy();
+  }
 }
@@ -33,6 +33,10 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
   */
  private final boolean textRoot;

+  public static <P> ExpressionList<P> forFetchGroup(Query<P> q) {
+    return new DefaultExpressionList<>(q, null, null, null, false);
+  }
+
  /**
   * Construct for Text root expression list - this handles implicit Bool Should, Must etc.
   */
@@ -75,7 +75,7 @@ final class SubQueryExpression extends AbstractExpression implements Unsupported

  @Override
  public void addSql(SpiExpressionRequest request) {
-    request.property(propName).append(op.expression).append('(').parse(sql).append(')');
+    request.property(propName).append(op.expression).append('(').append(sql).append(')');
  }

  @Override
@@ -15,26 +15,14 @@ public final class GenerateDmlRequest {
  private String prefix2;
  private int insertMode;
  private int bindColumnCount;
-  private boolean hasColumnDefn;

  GenerateDmlRequest append(String s) {
    sb.append(s);
    return this;
  }

-  /**
-   * Append column and type for Insert (ClickHouse).
-   */
-  public void appendColumnDefn(String columnName, String columnDefn) {
-    if (hasColumnDefn) {
-      sb.append(", ");
-    } else {
-      hasColumnDefn = true;
-    }
-    sb.append(columnName).append(' ').append(columnDefn);
-  }
-
  public void appendColumn(String column) {
+    //String bind = (insertMode > 0) ? "?" : "=?";
    appendColumn(column, "?");
  }

@@ -4,7 +4,6 @@ import io.ebean.InsertOptions;
 import io.ebean.annotation.Platform;
 import io.ebean.bean.EntityBean;
 import io.ebean.config.dbplatform.DatabasePlatform;
-import io.ebean.config.dbplatform.InsertSqlSyntaxExtension;
 import io.ebeaninternal.server.core.PersistRequestBean;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.InheritInfo;
@@ -38,13 +37,10 @@ final class InsertMeta {
  private final Bindable shadowFKey;
  private final String[] identityDbColumns;
  private final Platform platform;
-  private final InsertSqlSyntaxExtension insertMetaSql;
-
  private final InsertMetaOptions options;

  InsertMeta(DatabasePlatform dbPlatform, BeanDescriptor<?> desc, Bindable shadowFKey, BindableId id, BindableList all) {
    this.platform = dbPlatform.platform();
-    this.insertMetaSql = dbPlatform.insertSqlSyntaxExtension();
    this.options = InsertMetaPlatform.create(platform, desc, this);
    this.discriminator = discriminator(desc);
    this.id = id;
@@ -178,7 +174,7 @@ final class InsertMeta {
      request.append(defaultValues());
      return;
    }
-    request.append(insertMetaSql.startColumns());
+    request.append(" (");
    if (!nullId) {
      id.dmlAppend(request);
    }
@@ -193,28 +189,9 @@ final class InsertMeta {
    } else {
      allExcludeDraftOnly.dmlAppend(request);
    }
-    request.append(insertMetaSql.endColumns());
-    if (insertMetaSql.useBinding()) {
-      request.append(request.insertBindBuffer());
-      request.append(")");
-    } else {
-      request.append(insertMetaSql.startTypes());
-      if (!nullId) {
-        id.dmlType(request);
-      }
-      if (shadowFKey != null) {
-        shadowFKey.dmlType(request);
-      }
-      if (discriminator != null) {
-        discriminator.dmlType(request);
-      }
-      if (draftTable) {
-        all.dmlType(request);
-      } else {
-        allExcludeDraftOnly.dmlType(request);
-      }
-      request.append(insertMetaSql.endTypes());
-    }
+    request.append(") values (");
+    request.append(request.insertBindBuffer());
+    request.append(")");
  }

  private String defaultValues() {
@@ -33,11 +33,6 @@ public interface Bindable {
   */
  void dmlAppend(GenerateDmlRequest request);

-  /**
-   * Append column and type for Insert (ClickHouse).
-   */
-  void dmlType(GenerateDmlRequest request);
-
  /**
   * Bind given the request and bean. The bean could be the oldValues bean
   * when binding a update or delete where clause with ALL concurrency mode.
@@ -40,11 +40,6 @@ class BindableAssocOne implements Bindable {
    importedId.dmlAppend(request);
  }

-  @Override
-  public void dmlType(GenerateDmlRequest request) {
-    importedId.dmlType(request);
-  }
-
  @Override
  public void dmlBind(BindableRequest request, EntityBean bean) throws SQLException {
    EntityBean assocBean = (EntityBean) assocOne.getValue(bean);
@@ -39,11 +39,6 @@ public final class BindableDiscriminator implements Bindable {
    request.appendColumn(columnName);
  }

-  @Override
-  public void dmlType(GenerateDmlRequest request) {
-    throw new IllegalArgumentException("Not supported");
-  }
-
  @Override
  public void dmlBind(BindableRequest bindRequest, EntityBean bean) throws SQLException {
    bindRequest.bind(discValue, sqlType);
@@ -35,13 +35,6 @@ final class BindableEmbedded implements Bindable {
    }
  }

-  @Override
-  public void dmlType(GenerateDmlRequest request) {
-    for (Bindable item : items) {
-      item.dmlType(request);
-    }
-  }
-
  @Override
  public void addToUpdate(PersistRequestBean<?> request, List<Bindable> list) {
    if (request.isAddToUpdate(embProp)) {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Rob Bygrave	77383f4d29	Version 14.6.0	2024-09-17 22:23:13 +12:00
Rob Bygrave	29fcbbfe97	Bump ebean-agent to 14.6.0	2024-09-17 22:09:44 +12:00
Rob Bygrave	d9e0a35efb	Merge pull request #3481 from ebean-orm/feature/boostrap-service Use io.ebean.service.BootstrapService as common marker interface for service loading bootstrapped services	2024-09-17 22:03:52 +12:00
Rob Bygrave	0c01ecbac7	Merge pull request #3478 from ebean-orm/feature/3462 #3462 Add Paging as alternative to maxRows + firstRow + orderBy	2024-09-17 22:03:13 +12:00
Rob Bygrave	5095583cc8	Merge pull request #3473 from ebean-orm/feature/3455-query-beans-improvement #3455 - Improve query beans such that filterMany() expressions are only on ToMany relationships	2024-09-17 22:02:40 +12:00
Rob Bygrave	92f04a2353	Use io.ebean.service.BootstrapService as common marker interface for service loading bootstrapped services	2024-09-17 21:58:19 +12:00
Rob Bygrave	acbce35182	Merge pull request #3480 from ebean-orm/feature/emptylist Change EmptyPagedList to be deprecated from public use	2024-09-16 21:07:40 +12:00
Rob Bygrave	d6165f4b17	Change EmptyPagedList to be deprecated from public use This should never have been public really	2024-09-16 20:58:40 +12:00
Rob Bygrave	95656360a9	Mark OrderBy constructors as deprecated The plan is to migrate OrderBy into an interface	2024-09-15 19:21:17 +12:00
Rob Bygrave	65d7df5488	#3462 Add Paging as alternative to maxRows + firstRow + orderBy Paging is an alternative to specifying the maxRows + firstRow + orderBy on a query. Example: ```java var orderBy = OrderBy.of("lastName desc nulls first, firstName asc"); var paging = Paging.of(0, 100, orderBy); DB.find(Contact.class) .setPaging(paging) .where().startsWith("lastName", "foo") .findList(); ```	2024-09-12 22:54:35 +12:00
Rob Bygrave	12648cd37d	Fix test TestQueryFilterMany	2024-09-12 20:31:37 +12:00
Rob Bygrave	edbd13c075	Version 14.5.2	2024-09-11 20:58:13 +12:00
Rob Bygrave	0964980a69	Merge pull request #3474 from ebean-orm/feature/3453 #3453 - Different filterMany behavior when no matches found	2024-09-11 20:27:50 +12:00
Rob Bygrave	dc7d349366	#3453 - Different filterMany behavior when no matches found	2024-09-10 23:11:44 +12:00
Rob Bygrave	a2e66bcb89	#3455 - Improve query beans such that filterMany() expressions are only on ToMany relationships Use protected helper methods on TQAssocBean for the filterMany() methods generated onto AssocMany beans.	2024-09-10 00:24:41 +12:00
Rob Bygrave	4d79815779	#3455 - Improve query beans such that filterMany() expressions are only on ToMany relationships Changes the query bean code generation for "Associated beans" to have separate AssocOne and AssocMany for ToOne and ToMany relationships. Moves the filterMany() expressions such that they are only available on the *ToMany relationships.	2024-09-09 23:26:13 +12:00
Rob Bygrave	cbac00a89f	Merge pull request #3472 from ebean-orm/feature/3461-take-2 #3461 - Add also() for query beans	2024-09-09 22:18:40 +12:00
Rob Bygrave	33b2c398f6	#3461 - Add also() for query beans	2024-09-09 22:13:04 +12:00
Rob Bygrave	416f50e782	Merge pull request #3471 from ebean-orm/feature/bump-agent Bump ebean-agent, will support future improvement to query beans with…	2024-09-09 21:59:20 +12:00
Rob Bygrave	2e8a6ceb53	Bump ebean-agent, will support future improvement to query beans with AssocOne AssocMany	2024-09-09 21:54:09 +12:00
Rob Bygrave	f0fd9003ad	Version 14.5.1	2024-09-02 22:03:55 +12:00
Rob Bygrave	dfeffb7c5e	Bump ebean-agent, no effective change	2024-09-02 21:50:21 +12:00
Rob Bygrave	4b0fcb1d29	Merge pull request #3469 from ebean-orm/feature/orderBy2 #3466 - Duplicated entities in findMany when a ManyToOne relation is fetched	2024-09-02 20:53:42 +12:00
Rob Bygrave	a7fe5d2b84	#3466 - Duplicated entities in findMany when a ManyToOne relation is fetched (Postgresql) Internally in OrmQueryDetail.markQueryJoins() the SpiQueryManyJoin is determined and returned. This change uses this and effectively removes the code from OrmQueryRequest.determineMany() and BeanDescriptor.manyProperty() which was the source of this issue (performing a similar task but not correctly taking the full path into account and hence the source of this bug).	2024-09-02 19:28:11 +12:00
Rob Bygrave	30327fe33e	Improve existing test asserts around order by clause (#3467 )	2024-09-02 08:25:19 +12:00
Rob Bygrave	1e013331d4	Improve existing test asserts around order by clause	2024-09-02 08:19:02 +12:00
Rob Bygrave	f8964707d9	#3463 - Ignore queryBean.select(null) calls (#3464 )	2024-08-27 21:01:51 +12:00
Rob Bygrave	86c7de2de8	ebean-test: Modify postgis platform to support both net.postgis and og.postgis (#3449 ) * ebean-test: Modify postgis platform to support both net.postgis and org.postgis Use Class.forName() to test existence of net.postgis.jdbc.DriverWrapperLW and if available use that driver rather than the older org.postgis.DriverWrapperLW one. Also support explicitly specifying the driver to use via test property - ebean.test.postgis.driver * Update test for net postgis to use a separate container * Remove NetPostgisSetup as PostgisSetup handles both cases now	2024-08-27 20:44:03 +12:00
Michael Benz	53b4d94933	Update README.md fixing broken Foconis logo (#3457 ) Updated the Foconis AG logo with the new Foconis Analytics URL which was broken because of a deep link to a Yoomla logo that is no longer available.	2024-08-27 20:40:36 +12:00
Rob Bygrave	b0ec23e53c	Update tests to ensure ResetBasicData.reset() was called early	2024-08-04 18:59:46 +12:00
Rob Bygrave	20caae532c	Adjust ResetBasicData with more output	2024-08-04 18:15:22 +12:00
Rob Bygrave	4369481c1a	Adjust ResetBasicData with more output	2024-08-04 18:11:36 +12:00
Rob Bygrave	c94426b6b4	Update tests config for ebean-net-postgis-types	2024-07-22 22:01:42 +12:00
Rob Bygrave	b2ff32e88c	Update tests config for ebean-net-postgis-types	2024-07-22 21:47:48 +12:00
Rob Bygrave	3bd8dfa7bf	Update tests config for ebean-net-postgis-types	2024-07-22 20:12:27 +12:00
Rob Bygrave	0e7abdd137	Version 14.5.0	2024-07-22 08:33:34 +12:00
Ryszard Trojnacki	9135f2cd3e	New Postgis types / Java modules (#3448 ) * Added modules `ebean-net-postgis-types`, `ebean-net-postgis` for new `net.postgis` geometry types without support for GeoLatte. * Added missing `uses` entry in `module-info.java` for `io.ebean.api`.	2024-07-22 07:31:30 +12:00
Rob Bygrave	6785d5703e	Update tests for DB2 forUpdate()	2024-07-17 08:01:26 +12:00
Rob Bygrave	0a95ac7fa0	Update tests for DB2 forUpdate()	2024-07-16 22:18:29 +12:00
Rob Bygrave	bbd5636689	#3444 - DBName with hyphens creates invalid code (#3447 )	2024-07-16 20:22:08 +12:00
Noemi Praml	9f0eaef3d8	Db2 forupdate fix (#3446 ) * ADD failing test for db2 * ADD: possible fix	2024-07-16 19:37:20 +12:00
Rob Bygrave	a5d2a574d3	#3433 - Put test back from desc -> description as desc as a column name isn't widely supported by other databases	2024-07-08 21:54:35 +12:00
Rob Bygrave	6e7adbb8e4	#3433 - Entity property called desc used with query order by desc generates bad sql (#3438 )	2024-07-04 00:05:01 +12:00
Rob Bygrave	8913bead89	[ebean-migration] #3434 - Connection is closed error running migration with MySql and Hikari (#3437 )	2024-07-02 23:47:14 +12:00
Rob Bygrave	cdf1cd8487	[ebean-redis] Fix for #3432 empty value for natural keys (#3436 )	2024-07-02 22:06:57 +12:00
Rob Bygrave	2582c4b653	Bump to ebean-agent 14.5.0/15.5.0 with ASM 9.7 for JDK 22 and 23 support (#3435 )	2024-07-02 18:08:08 +12:00
Rob Bygrave	a9e3e2ea43	Version 14.4.0	2024-06-26 22:33:04 +12:00
Rob Bygrave	834ce971b3	Bump ebean-agent, no functional change	2024-06-26 22:19:58 +12:00
Rob Bygrave	5c27f89677	Change includeLabelInSql to default to true (#3431 ) To disable this use ebean.includeLabelInSql=false or set this via `DatabaseBuilder.includeLabelInSql(false)``	2024-06-26 20:32:19 +12:00
Rob Bygrave	bfbbb7e7a7	Bump ebean-datasource dependency to 9.0 with automatic Lambda mode detection (#3430 ) * Bump ebean-datasource dependency to 9.0 with automatic Lambda mode detection ebean-datasource 9.0 automatically detects when it is running in AWS Lambda and will set validateOnHeartbeat to false. In Lambda we don't want to validate connections in background threads that can suspend in Lambda.	2024-06-26 20:27:49 +12:00
Rob Bygrave	a8947c7d2f	Bump ebean-migration dependency to 14.1.0 with fastMode enabled by default (#3429 ) ebean-migration 14.1.0 defaults fastMode to true. This means that it first runs a fast check that all migrations have been run. If that does not succeed for any reason it runs the normal migration process.	2024-06-26 20:15:21 +12:00
Rob Bygrave	d5401efb08	#3423 JtaTransactionManager keeps reference to already closed scope (and Transaction/connection ThreadLocal) when JtaTxnListener#afterCompletion is called by a different thread (#3424 ) Bugfix for "Long/slow transaction reaper" in Wildfire that can close/rollback a transaction in a different thread. Fix is to use active flag to inactivate the transaction and detect that case in JtaTransactionManager.getCurrentTransaction()	2024-06-21 07:57:31 +12:00
Rob Bygrave	925ceaf441	Update build actions/setup-java@v4	2024-06-14 21:47:43 +12:00
Rob Bygrave	c5fea13ca5	Update build actions/setup-java@v4	2024-06-14 21:42:06 +12:00
Rob Bygrave	6fa3759786	Add 23 to build	2024-06-14 21:34:54 +12:00
Rob Bygrave	1c5288b6ec	Version 14.3.1	2024-06-10 19:26:40 +12:00
Rob Bygrave	b485fb7440	Bump ebean-agent to 14.3.1	2024-06-10 19:02:41 +12:00
Rob Bygrave	b07f909dd3	Bump parent pom to 4.2 with EA changes to annotation processing (#3417 ) * Bump parent pom to 4.2 with EA changes to annotation processing Annotation processing needs to be explicitly on in JDK 24 EA builds * Bump bytebuddy version in ebean-test and use experimental=true for EA builds * Use parent pom 4.3 with bytebuddy.experimental=true by default for surefire	2024-06-10 18:36:40 +12:00
Rob Bygrave	fa92e7a4b7	Merge pull request #3416 from ebean-orm/feature/querybean-gen-suppresswarnings Change QueryBean to use protected constructors, suppress warning on generated query beans	2024-06-10 12:39:53 +12:00
Rob Bygrave	1823ef288a	Change QueryBean to use protected constructors, suppress warning on generated query beans	2024-06-07 22:48:04 +12:00
Rob Bygrave	7b2128b02f	Merge pull request #3415 from ebean-orm/feature/3412 #3412 Use existing/parent transaction with fetch query on ToMany paths	2024-06-07 22:31:24 +12:00
Rob Bygrave	3c84a902e8	Followup for #3412 - Refactor DefaultBeanLoader move query creation logic into LoadBeanRequest Move the query creation, using transaction and configure into LoadBeanRequest. This code then looks more like that of LoadManyRequest.	2024-06-07 22:26:48 +12:00
Rob Bygrave	3ce95c34cb	#3412 Use existing/parent transaction with fetch query on ToMany paths Fix such that LoadManyRequest uses the parent requests transaction rather than obtain a new read only transaction to perform the fetch query.	2024-06-07 22:16:02 +12:00
Rob Bygrave	d817dcb549	Merge pull request #3413 from ebean-orm/feature/fix-logging-naturalKey Fix logging message for naturalKey MPUT to include the natural key properties	2024-05-31 21:57:24 +12:00
Rob Bygrave	5f218e1fdb	Merge pull request #3409 from kaiyaok2/fix_NIO Fixed non-idempotent tests in `TestCacheSerialization`	2024-05-31 21:56:33 +12:00
Rob Bygrave	59daf5689a	Fix logging message for naturalKey MPUT to include the natural key properties	2024-05-31 21:52:38 +12:00
kaiyaok2	44efed5cd9	fixed non-idempotent tests	2024-05-26 23:57:12 +08:00
Rob Bygrave	be28314e31	Update test kotlin to use kotlin-querybean-generator 14.3.0 Fixes the test as we now use QueryBean etc rather than TQRootBean	2024-05-16 00:05:55 +12:00
Rob Bygrave	053d82b54a	Version 14.3.0	2024-05-14 22:10:08 +12:00
Rob Bygrave	0141e2effa	Merge pull request #3401 from ebean-orm/feature/agent-14.3.0 Bump to ebean-agent 14.3.0	2024-05-14 21:18:12 +12:00
Rob Bygrave	a33bb4d4c8	Bump to ebean-agent 14.3.0	2024-05-14 21:15:13 +12:00
Rob Bygrave	d0348210be	Merge pull request #3398 from ebean-orm/feature/NoTimeZone mysql: Support "NoTimeZone" to bypass MySQL JDBC use of Timezone Calendar	2024-05-01 20:30:56 +12:00
Rob Bygrave	753cf66cf0	Merge pull request #3397 from ebean-orm/feature/distinctOn Postgres: Add support for DISTINCT ON query clause	2024-05-01 20:30:41 +12:00
Rob Bygrave	4a8b4dd5fb	mysql: Support "NoTimeZone" to bypass MySQL JDBC use of Timezone Calendar Refer #3393 #3394	2024-05-01 20:24:10 +12:00
robin.bygrave	2faf7008db	#3397 DISTINCT ON subquery support	2024-05-01 20:07:16 +12:00
Rob Bygrave	76c25cbe83	Postgres: Add support for DISTINCT ON query clause - fix test ebean.properties	2024-05-01 01:04:33 +12:00
Rob Bygrave	5c36a725f4	Postgres: Add support for DISTINCT ON query clause	2024-05-01 00:50:37 +12:00
Rob Bygrave	b99d4f5a51	Merge pull request #3396 from ebean-orm/feature/limitOffset-with-labelComment Include inline sql hint and comment in limit/offset sql	2024-04-30 23:57:04 +12:00
Rob Bygrave	7d18942357	Include inline sql hint and comment in limit/offset sql	2024-04-30 23:46:36 +12:00