From c6defceec98490d3513b672f7e8e21db3b99eaa5 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Mon, 15 Jan 2024 21:02:47 +1300 Subject: [PATCH 01/25] Add additional test for filterMany() with fetch() --- .../org/tests/query/TestQueryFilterMany.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFilterMany.java b/ebean-test/src/test/java/org/tests/query/TestQueryFilterMany.java index e60462ab2..6c4a3915b 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFilterMany.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFilterMany.java @@ -355,6 +355,24 @@ public class TestQueryFilterMany extends BaseTestCase { assertSql(sql.get(1)).contains(" and lower(t0.title) like"); } + @Test + public void testFetchAndFilterMany() { + + ResetBasicData.reset(); + LoggedSql.start(); + DB.find(Customer.class) + .fetch("contacts") + .filterMany("contacts.notes").istartsWith("title", "foo") + .findList(); + + List sql = LoggedSql.stop(); + + assertThat(sql.size()).isEqualTo(2); + assertSql(sql.get(0)).contains(" from o_customer t0 left join contact t1 on t1.customer_id = t0.id"); + platformAssertIn(sql.get(1), " from contact_note t0 where (t0.contact_id)"); + assertSql(sql.get(1)).contains(" and lower(t0.title) like"); + } + @Test public void testFilterManyUsingExpression() { From 487368976f91d8572f0a330c1391a0756f9c7ff9 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Mon, 15 Jan 2024 22:03:17 +1300 Subject: [PATCH 02/25] Tidy SimpleQueryBeanWriter internals --- .../querybean/generator/SimpleQueryBeanWriter.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleQueryBeanWriter.java b/querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleQueryBeanWriter.java index 7036c89c2..dbfe47c82 100644 --- a/querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleQueryBeanWriter.java +++ b/querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleQueryBeanWriter.java @@ -21,7 +21,6 @@ class SimpleQueryBeanWriter { private final List properties = new ArrayList<>(); private final TypeElement element; private final TypeElement implementsInterface; - private String implementsInterfaceFullName; private String implementsInterfaceShortName; private final ProcessingContext processingContext; private final String dbName; @@ -29,10 +28,9 @@ class SimpleQueryBeanWriter { private final boolean isEntity; private final boolean embeddable; - private String destPackage; - private String shortName; + private final String destPackage; + private final String shortName; private final String shortInnerName; - private final String origShortName; private final boolean fullyQualify; private Append writer; @@ -45,7 +43,6 @@ class SimpleQueryBeanWriter { String sn = Util.shortName(nested, beanFullName); this.shortInnerName = Util.shortName(false, sn); this.shortName = sn.replace('.', '$'); - this.origShortName = shortName; this.isEntity = processingContext.isEntity(element); this.embeddable = processingContext.isEmbeddable(element); this.dbName = findDbName(); @@ -72,14 +69,10 @@ class SimpleQueryBeanWriter { return isEntity; } - private boolean isEmbeddable() { - return embeddable; - } - private void gatherPropertyDetails() { importTypes.add(beanFullName); if (implementsInterface != null) { - implementsInterfaceFullName = implementsInterface.getQualifiedName().toString(); + String implementsInterfaceFullName = implementsInterface.getQualifiedName().toString(); boolean nested = implementsInterface.getNestingKind().isNested(); implementsInterfaceShortName = Util.shortName(nested, implementsInterfaceFullName); From 4ebb5fd11261d5e74677a52fcc20fc995adb2204 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Mon, 15 Jan 2024 22:30:17 +1300 Subject: [PATCH 03/25] #3296 Add copy() method to query beans --- .../java/org/querytest/QCustomerTest.java | 19 +++++++++++++++++++ .../generator/KotlinLangAdapter.java | 7 +++++++ .../generator/SimpleQueryBeanWriter.java | 6 ++++++ 3 files changed, 32 insertions(+) diff --git a/ebean-querybean/src/test/java/org/querytest/QCustomerTest.java b/ebean-querybean/src/test/java/org/querytest/QCustomerTest.java index d2a8bedff..1b80360bb 100644 --- a/ebean-querybean/src/test/java/org/querytest/QCustomerTest.java +++ b/ebean-querybean/src/test/java/org/querytest/QCustomerTest.java @@ -63,6 +63,25 @@ public class QCustomerTest { } + @Test + public void copy() { + var origin = new QCustomer() + .setDistinct(true) + .status.equalTo(Customer.Status.BAD); + + var copy1 = origin.copy().name.isNotNull(); + var q1 = copy1.query(); + copy1.findList(); + + assertThat(q1.getGeneratedSql()).contains("from be_customer t0 where t0.status = ? and t0.name is not null"); + + var copy2 = origin.copy().version.ge(1L); + var q2 = copy2.query(); + copy2.findList(); + + assertThat(q2.getGeneratedSql()).contains("from be_customer t0 where t0.status = ? and t0.version >= ?"); + } + @Test public void findSingleAttribute() { diff --git a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/KotlinLangAdapter.java b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/KotlinLangAdapter.java index f0c6f1573..d92383e97 100644 --- a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/KotlinLangAdapter.java +++ b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/KotlinLangAdapter.java @@ -94,6 +94,13 @@ class KotlinLangAdapter implements LangAdapter { writer.append(" * Private constructor for FetchGroup building.").eol(); writer.append(" */").eol(); writer.append(" private constructor(fetchGroupQuery: Query<%s>) : super(fetchGroupQuery)", shortName).eol(); + + writer.eol(); + writer.append(" /** Return a copy of the query. */").eol(); + writer.append(" fun copy() : Q%s {", shortName).eol(); + writer.append(" return Q%s(query().copy())", shortName).eol(); + writer.append(" }").eol(); + writer.eol(); } @Override diff --git a/querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleQueryBeanWriter.java b/querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleQueryBeanWriter.java index dbfe47c82..0cb6be142 100644 --- a/querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleQueryBeanWriter.java +++ b/querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleQueryBeanWriter.java @@ -194,6 +194,12 @@ class SimpleQueryBeanWriter { writer.append(" private Q%s(io.ebean.ExpressionList<%s> filter) {", shortName, shortName).eol(); writer.append(" super(filter);").eol(); writer.append(" }").eol(); + + writer.eol(); + writer.append(" /** Return a copy of the query bean. */").eol(); + writer.append(" public Q%s copy() {", shortName).eol(); + writer.append(" return new Q%s(query().copy());", shortName).eol(); + writer.append(" }").eol(); } /** From 8a7379879bc15d46f7f352fecb91ba11746e42ca Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 18 Jan 2024 20:15:57 +1300 Subject: [PATCH 04/25] Add forRemoval=true for existing Deprecated methods in query beans --- .../src/main/java/io/ebean/typequery/PBaseString.java | 4 ++-- .../src/main/java/io/ebean/typequery/TQRootBean.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PBaseString.java b/ebean-querybean/src/main/java/io/ebean/typequery/PBaseString.java index f94fb267b..9a5c21f6c 100644 --- a/ebean-querybean/src/main/java/io/ebean/typequery/PBaseString.java +++ b/ebean-querybean/src/main/java/io/ebean/typequery/PBaseString.java @@ -32,7 +32,7 @@ public abstract class PBaseString extends PBaseComparable { * @param value the equal to bind value * @return the root query bean instance */ - @Deprecated + @Deprecated(forRemoval = true) public final R equalToType(T value) { expr().eq(_name, value); return _root; @@ -46,7 +46,7 @@ public abstract class PBaseString extends PBaseComparable { * @param value the equal to bind value * @return the root query bean instance */ - @Deprecated + @Deprecated(forRemoval = true) public final R notEqualToType(T value) { expr().ne(_name, value); return _root; diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java b/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java index 01f007553..c2628ffda 100644 --- a/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java +++ b/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java @@ -1275,7 +1275,7 @@ public abstract class TQRootBean { /** * @deprecated migrate to {@link #orderBy()}. */ - @Deprecated(since = "13.19") + @Deprecated(since = "13.19", forRemoval = true) public R order() { return root; } @@ -1295,7 +1295,7 @@ public abstract class TQRootBean { /** * @deprecated migrate to {@link #orderBy(String)} */ - @Deprecated(since = "13.19") + @Deprecated(since = "13.19", forRemoval = true) public R order(String orderByClause) { return orderBy(orderByClause); } From a6a38b9a92d90dc9f9eab0d64cf630801172dab4 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 18 Jan 2024 22:30:09 +1300 Subject: [PATCH 05/25] Bump avaje-config to version 3.10 --- ebean-api/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml index dd6a63d34..a89ee0498 100644 --- a/ebean-api/pom.xml +++ b/ebean-api/pom.xml @@ -39,7 +39,7 @@ io.avaje avaje-config - 3.9 + 3.10 From 2e1b52d7d402fbbb44c62e3e7764db1ecb2c0944 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Kal=C3=A1b?= Date: Thu, 18 Jan 2024 11:32:34 +0100 Subject: [PATCH 06/25] WIP: fix TQRootBean.exists() when used with .or() --- .../java/io/ebean/typequery/TQRootBean.java | 8 +++--- .../test/java/org/example/domain/Contact.java | 8 +++++- .../example/domain/finder/ContactFinder.java | 18 ++++++++++++ .../org/querytest/QCustomerAndOrTest.java | 28 +++++++++++++++++++ 4 files changed, 57 insertions(+), 5 deletions(-) create mode 100644 ebean-querybean/src/test/java/org/example/domain/finder/ContactFinder.java diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java b/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java index 01f007553..148b201ea 100644 --- a/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java +++ b/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java @@ -745,7 +745,7 @@ public abstract class TQRootBean { * Add EXISTS sub-query predicate. */ public R exists(Query subQuery) { - query.where().exists(subQuery); + peekExprList().exists(subQuery); return root; } @@ -753,7 +753,7 @@ public abstract class TQRootBean { * Add NOT EXISTS sub-query predicate. */ public R notExists(Query subQuery) { - query.where().notExists(subQuery); + peekExprList().notExists(subQuery); return root; } @@ -764,7 +764,7 @@ public abstract class TQRootBean { * @param bindValues Optional bind values if the SubQuery uses {@code ? } bind values. */ public final R exists(String sqlSubQuery, Object... bindValues) { - query().where().exists(sqlSubQuery, bindValues); + peekExprList().exists(sqlSubQuery, bindValues); return root; } @@ -775,7 +775,7 @@ public abstract class TQRootBean { * @param bindValues Optional bind values if the SubQuery uses {@code ? } bind values. */ public final R notExists(String sqlSubQuery, Object... bindValues) { - query().where().notExists(sqlSubQuery, bindValues); + peekExprList().notExists(sqlSubQuery, bindValues); return root; } diff --git a/ebean-querybean/src/test/java/org/example/domain/Contact.java b/ebean-querybean/src/test/java/org/example/domain/Contact.java index 7d2554f57..505cb556a 100644 --- a/ebean-querybean/src/test/java/org/example/domain/Contact.java +++ b/ebean-querybean/src/test/java/org/example/domain/Contact.java @@ -1,8 +1,9 @@ package org.example.domain; import io.ebean.annotation.DbArray; - import jakarta.persistence.*; +import org.example.domain.finder.ContactFinder; + import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import java.time.ZonedDateTime; @@ -17,6 +18,11 @@ import java.util.Map; @Table(name = "be_contact") public class Contact extends BaseModel { + /** + * Convenience Finder for 'active record' style. + */ + public static final ContactFinder find = new ContactFinder(); + @DbArray List<@Size(max=20) String> phoneNumbers = new ArrayList<>(); diff --git a/ebean-querybean/src/test/java/org/example/domain/finder/ContactFinder.java b/ebean-querybean/src/test/java/org/example/domain/finder/ContactFinder.java new file mode 100644 index 000000000..42f0daccb --- /dev/null +++ b/ebean-querybean/src/test/java/org/example/domain/finder/ContactFinder.java @@ -0,0 +1,18 @@ +package org.example.domain.finder; + +import io.ebean.Finder; +import org.example.domain.Contact; +import org.example.domain.query.QContact; + +/** + */ +public class ContactFinder extends Finder { + + public ContactFinder() { + super(Contact.class); + } + + public QContact typed() { + return new QContact(); + } +} diff --git a/ebean-querybean/src/test/java/org/querytest/QCustomerAndOrTest.java b/ebean-querybean/src/test/java/org/querytest/QCustomerAndOrTest.java index b930c1509..2025b6d79 100644 --- a/ebean-querybean/src/test/java/org/querytest/QCustomerAndOrTest.java +++ b/ebean-querybean/src/test/java/org/querytest/QCustomerAndOrTest.java @@ -1,6 +1,8 @@ package org.querytest; +import org.example.domain.Contact; import org.example.domain.Customer; +import org.example.domain.query.QCustomer; import org.junit.jupiter.api.Test; import java.time.LocalDate; @@ -9,6 +11,8 @@ import java.time.ZoneId; import java.util.Date; import java.util.List; +import static org.assertj.core.api.Assertions.assertThat; + public class QCustomerAndOrTest { @Test @@ -55,6 +59,30 @@ public class QCustomerAndOrTest { } + @Test + public void testOrWithExists() { + QCustomer query = Customer.find.typed() + .alias("customer") + .or() + .name.eq("Superman") + .exists(Contact.find.typed() + .alias("contact") + .firstName.eq("Superman") + .raw("contact.customer_id = customer.id") + .query() + ) + .endOr() + .select(QCustomer.alias().id); + + query.findList(); + + assertThat(query.getGeneratedSql()).isEqualTo( + "select customer.id from be_customer customer where (" + + "customer.name = ? or exists (select 1 from be_contact contact where " + + "contact.first_name = ? and contact.customer_id = customer.id))" + ); + } + private Date fiveDaysAgo() { LocalDateTime fiveDaysAgo = LocalDate.now().atStartOfDay().minusDays(5); return new Date(fiveDaysAgo.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()); From e80e8e027a6f704e66a9aeb6b1b14998c958488a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Kli=C4=8Dka?= Date: Thu, 18 Jan 2024 16:49:04 +0100 Subject: [PATCH 07/25] One to many replacing collection failing test cases --- .../o2m/OneToManyListMarkAsDirtyTest.java | 149 ++++++++++++++++++ .../java/org/tests/o2m/dm/GoodsCapacity.java | 41 +++++ .../java/org/tests/o2m/dm/StrategicPlan.java | 34 ++++ 3 files changed, 224 insertions(+) create mode 100644 ebean-test/src/test/java/org/tests/o2m/OneToManyListMarkAsDirtyTest.java create mode 100644 ebean-test/src/test/java/org/tests/o2m/dm/GoodsCapacity.java create mode 100644 ebean-test/src/test/java/org/tests/o2m/dm/StrategicPlan.java diff --git a/ebean-test/src/test/java/org/tests/o2m/OneToManyListMarkAsDirtyTest.java b/ebean-test/src/test/java/org/tests/o2m/OneToManyListMarkAsDirtyTest.java new file mode 100644 index 000000000..e5210e2e8 --- /dev/null +++ b/ebean-test/src/test/java/org/tests/o2m/OneToManyListMarkAsDirtyTest.java @@ -0,0 +1,149 @@ +package org.tests.o2m; + +import io.ebean.DB; +import io.ebean.xtest.BaseTestCase; +import org.junit.jupiter.api.Test; +import org.tests.o2m.dm.*; + +import java.sql.Timestamp; +import java.util.ArrayList; + +import static org.assertj.core.api.Assertions.assertThat; + +public class OneToManyListMarkAsDirtyTest extends BaseTestCase { + @Test + public void workingTestCase() { + var g = new GoodsEntity(); + DB.save(g); + + var planStart = new StrategicPlan(); + planStart.setName("aaa"); + planStart.setGoodsCapacities(new ArrayList<>()); + DB.save(planStart); + + var planFirstCapacity = DB.find(StrategicPlan.class, planStart.getId()); + planFirstCapacity.setGoodsCapacities(new ArrayList<>()); + var a_b = new GoodsCapacity(); + a_b.setGoods(g); + planFirstCapacity.getGoodsCapacities().add(a_b); + DB.save(planFirstCapacity); + + var planSecondCapacity = DB.find(StrategicPlan.class, planStart.getId()); + planSecondCapacity.setGoodsCapacities(new ArrayList<>()); + var a_c = new GoodsCapacity(); + a_c.setGoods(g); + planSecondCapacity.getGoodsCapacities().add(a_c); + // without this the goods capacity is saved correctly, version remains same + // (not sure if version should stay the same if OneToMany relationship is changed (through cascade) + // DB.markAsDirty(planSecondCapacity); + DB.save(planSecondCapacity); + + var refreshedPlanSecondCapacity = DB.find(StrategicPlan.class, planStart.getId()); + assertThat(refreshedPlanSecondCapacity.getGoodsCapacities().size()).isEqualTo(1); + assertThat(refreshedPlanSecondCapacity.getGoodsCapacities().get(0).getId()).isEqualTo(a_c.getId()); + assertThat(refreshedPlanSecondCapacity.getVersion()).isEqualTo(planFirstCapacity.getVersion()); + assertThat(refreshedPlanSecondCapacity.getWhenModified()).isEqualTo(planFirstCapacity.getWhenModified()); + } + + @Test + public void oneToManyShouldBeDeletedWithParentMarkAsDirtyTest() { + var g = new GoodsEntity(); + DB.save(g); + + var planStart = new StrategicPlan(); + planStart.setName("aaa"); + planStart.setGoodsCapacities(new ArrayList<>()); + DB.save(planStart); + + var planFirstCapacity = DB.find(StrategicPlan.class, planStart.getId()); + planFirstCapacity.setGoodsCapacities(new ArrayList<>()); + var a_b = new GoodsCapacity(); + a_b.setGoods(g); + planFirstCapacity.getGoodsCapacities().add(a_b); + DB.save(planFirstCapacity); + + var planSecondCapacity = DB.find(StrategicPlan.class, planStart.getId()); + planSecondCapacity.setGoodsCapacities(new ArrayList<>()); + var a_c = new GoodsCapacity(); + a_c.setGoods(g); + planSecondCapacity.getGoodsCapacities().add(a_c); + // force version increase + // without this the goods capacity is saved correctly, but version isn't + DB.markAsDirty(planSecondCapacity); + DB.save(planSecondCapacity); + + var refreshedPlanSecondCapacity = DB.find(StrategicPlan.class, planStart.getId()); + assertThat(refreshedPlanSecondCapacity.getGoodsCapacities().size()).isEqualTo(1); + assertThat(refreshedPlanSecondCapacity.getGoodsCapacities().get(0).getId()).isEqualTo(a_c.getId()); + assertThat(refreshedPlanSecondCapacity.getVersion()).isGreaterThan(planFirstCapacity.getVersion()); + assertThat(refreshedPlanSecondCapacity.getWhenModified()).isAfter(planFirstCapacity.getWhenModified()); + } + + @Test + public void oneToManyShouldBeDeletedWithParentMarkAsDirtyTestWorkAround() { + var g = new GoodsEntity(); + DB.save(g); + + var planStart = new StrategicPlan(); + planStart.setName("aaa"); + planStart.setGoodsCapacities(new ArrayList<>()); + DB.save(planStart); + + var planFirstCapacity = DB.find(StrategicPlan.class, planStart.getId()); + planFirstCapacity.setGoodsCapacities(new ArrayList<>()); + var a_b = new GoodsCapacity(); + a_b.setGoods(g); + planFirstCapacity.getGoodsCapacities().add(a_b); + DB.save(planFirstCapacity); + + var planSecondCapacity = DB.find(StrategicPlan.class, planStart.getId()); +// planSecondCapacity.setGoodsCapacities(new ArrayList<>()); + planSecondCapacity.getGoodsCapacities().clear(); + var a_c = new GoodsCapacity(); + a_c.setGoods(g); + planSecondCapacity.getGoodsCapacities().add(a_c); + // force version increase + // without this the goods capacity is saved correctly, but version isn't + DB.markAsDirty(planSecondCapacity); + DB.save(planSecondCapacity); + + var refreshedPlanSecondCapacity = DB.find(StrategicPlan.class, planStart.getId()); + assertThat(refreshedPlanSecondCapacity.getGoodsCapacities().size()).isEqualTo(1); + assertThat(refreshedPlanSecondCapacity.getGoodsCapacities().get(0).getId()).isEqualTo(a_c.getId()); + assertThat(refreshedPlanSecondCapacity.getVersion()).isGreaterThan(planFirstCapacity.getVersion()); + assertThat(refreshedPlanSecondCapacity.getWhenModified()).isAfter(planFirstCapacity.getWhenModified()); + } + + @Test + public void oneToManyShouldBeDeletedWithParentManualModifiedWhenTest() { + var g = new GoodsEntity(); + DB.save(g); + + var planStart = new StrategicPlan(); + planStart.setName("aaa"); + planStart.setGoodsCapacities(new ArrayList<>()); + DB.save(planStart); + + var planFirstCapacity = DB.find(StrategicPlan.class, planStart.getId()); + planFirstCapacity.setGoodsCapacities(new ArrayList<>()); + var a_b = new GoodsCapacity(); + a_b.setGoods(g); + planFirstCapacity.getGoodsCapacities().add(a_b); + DB.save(planFirstCapacity); + + var planSecondCapacity = DB.find(StrategicPlan.class, planStart.getId()); + planSecondCapacity.setGoodsCapacities(new ArrayList<>()); + var a_c = new GoodsCapacity(); + a_c.setGoods(g); + planSecondCapacity.getGoodsCapacities().add(a_c); + planSecondCapacity.setWhenCreated(new Timestamp(System.currentTimeMillis())); + + DB.save(planSecondCapacity); + + var refreshedPlanSecondCapacity = DB.find(StrategicPlan.class, planStart.getId()); + assertThat(refreshedPlanSecondCapacity.getGoodsCapacities().size()).isEqualTo(1); + assertThat(refreshedPlanSecondCapacity.getGoodsCapacities().get(0).getId()).isEqualTo(a_c.getId()); + assertThat(refreshedPlanSecondCapacity.getVersion()).isGreaterThan(planFirstCapacity.getVersion()); + assertThat(refreshedPlanSecondCapacity.getWhenModified()).isAfter(planFirstCapacity.getWhenModified()); + } +} diff --git a/ebean-test/src/test/java/org/tests/o2m/dm/GoodsCapacity.java b/ebean-test/src/test/java/org/tests/o2m/dm/GoodsCapacity.java new file mode 100644 index 000000000..697804f01 --- /dev/null +++ b/ebean-test/src/test/java/org/tests/o2m/dm/GoodsCapacity.java @@ -0,0 +1,41 @@ +package org.tests.o2m.dm; + +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; + +@Entity +//@Table(name = "strategic_plan_goods_capacities") +public class GoodsCapacity { + @Id + private Long id; + + @ManyToOne + private StrategicPlan strategicPlan; + @ManyToOne + private GoodsEntity goods; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public StrategicPlan getStrategicPlan() { + return strategicPlan; + } + + public void setStrategicPlan(StrategicPlan strategicPlan) { + this.strategicPlan = strategicPlan; + } + + public GoodsEntity getGoods() { + return goods; + } + + public void setGoods(GoodsEntity goods) { + this.goods = goods; + } +} diff --git a/ebean-test/src/test/java/org/tests/o2m/dm/StrategicPlan.java b/ebean-test/src/test/java/org/tests/o2m/dm/StrategicPlan.java new file mode 100644 index 000000000..c55e8d810 --- /dev/null +++ b/ebean-test/src/test/java/org/tests/o2m/dm/StrategicPlan.java @@ -0,0 +1,34 @@ +package org.tests.o2m.dm; + + +import io.ebean.annotation.DbJsonB; +import jakarta.persistence.*; + +import java.time.LocalDate; +import java.util.ArrayList; +import java.util.List; + +@Entity +//@Table(name = "strategic_plans") +public class StrategicPlan extends HistoryColumns { + private String name; + + @OneToMany(mappedBy = "strategicPlan", cascade = CascadeType.ALL, orphanRemoval = true) + private List goodsCapacities = new ArrayList<>(); + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public List getGoodsCapacities() { + return goodsCapacities; + } + + public void setGoodsCapacities(List goodsCapacities) { + this.goodsCapacities = goodsCapacities; + } +} From 006e33cb3e60e41f519a515945172352d9f73b98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Kli=C4=8Dka?= Date: Thu, 18 Jan 2024 17:29:24 +0100 Subject: [PATCH 08/25] One to many replacing collection failing test cases --- .../test/java/org/tests/o2m/OneToManyListMarkAsDirtyTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ebean-test/src/test/java/org/tests/o2m/OneToManyListMarkAsDirtyTest.java b/ebean-test/src/test/java/org/tests/o2m/OneToManyListMarkAsDirtyTest.java index e5210e2e8..aa35a1036 100644 --- a/ebean-test/src/test/java/org/tests/o2m/OneToManyListMarkAsDirtyTest.java +++ b/ebean-test/src/test/java/org/tests/o2m/OneToManyListMarkAsDirtyTest.java @@ -41,6 +41,7 @@ public class OneToManyListMarkAsDirtyTest extends BaseTestCase { var refreshedPlanSecondCapacity = DB.find(StrategicPlan.class, planStart.getId()); assertThat(refreshedPlanSecondCapacity.getGoodsCapacities().size()).isEqualTo(1); assertThat(refreshedPlanSecondCapacity.getGoodsCapacities().get(0).getId()).isEqualTo(a_c.getId()); + // todo is this expected? assertThat(refreshedPlanSecondCapacity.getVersion()).isEqualTo(planFirstCapacity.getVersion()); assertThat(refreshedPlanSecondCapacity.getWhenModified()).isEqualTo(planFirstCapacity.getWhenModified()); } @@ -103,7 +104,6 @@ public class OneToManyListMarkAsDirtyTest extends BaseTestCase { a_c.setGoods(g); planSecondCapacity.getGoodsCapacities().add(a_c); // force version increase - // without this the goods capacity is saved correctly, but version isn't DB.markAsDirty(planSecondCapacity); DB.save(planSecondCapacity); From 0046d983cbc56d2150c5807c79a3a58cac962a5a Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Fri, 19 Jan 2024 08:14:58 +1300 Subject: [PATCH 09/25] Adjust test such that table alias does not clash The .raw("contact.customer_id = customer.id") clashes as "customer.id" is a logical path from contact --- .../test/java/org/querytest/QCustomerAndOrTest.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ebean-querybean/src/test/java/org/querytest/QCustomerAndOrTest.java b/ebean-querybean/src/test/java/org/querytest/QCustomerAndOrTest.java index 2025b6d79..7862e0dcd 100644 --- a/ebean-querybean/src/test/java/org/querytest/QCustomerAndOrTest.java +++ b/ebean-querybean/src/test/java/org/querytest/QCustomerAndOrTest.java @@ -62,13 +62,13 @@ public class QCustomerAndOrTest { @Test public void testOrWithExists() { QCustomer query = Customer.find.typed() - .alias("customer") + .alias("_cust") .or() .name.eq("Superman") .exists(Contact.find.typed() .alias("contact") .firstName.eq("Superman") - .raw("contact.customer_id = customer.id") + .raw("contact.customer_id = _cust.id") .query() ) .endOr() @@ -77,9 +77,9 @@ public class QCustomerAndOrTest { query.findList(); assertThat(query.getGeneratedSql()).isEqualTo( - "select customer.id from be_customer customer where (" + - "customer.name = ? or exists (select 1 from be_contact contact where " + - "contact.first_name = ? and contact.customer_id = customer.id))" + "select _cust.id from be_customer _cust where (" + + "_cust.name = ? or exists (select 1 from be_contact contact where " + + "contact.first_name = ? and contact.customer_id = _cust.id))" ); } From 44770382fbcd4111daac32b8cc99e22b3f6c59d6 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Fri, 19 Jan 2024 10:41:54 +1300 Subject: [PATCH 10/25] enh: Add findSingleAttributeOrEmpty() returning Optional --- ebean-api/src/main/java/io/ebean/Query.java | 19 +++++++++++++ .../server/query/DefaultFetchGroupQuery.java | 5 ++++ .../server/querydefn/DefaultOrmQuery.java | 8 ++++-- .../java/io/ebean/typequery/TQRootBean.java | 22 +++++++++++++++ .../java/org/querytest/QCustomerTest.java | 26 ++++++++++++++++++ .../query/other/TestQuerySingleAttribute.java | 27 +++++++++++++++++++ 6 files changed, 105 insertions(+), 2 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/Query.java b/ebean-api/src/main/java/io/ebean/Query.java index 28cce0506..ef941aa1f 100644 --- a/ebean-api/src/main/java/io/ebean/Query.java +++ b/ebean-api/src/main/java/io/ebean/Query.java @@ -970,6 +970,25 @@ public interface Query extends CancelableQuery { @Nullable A findSingleAttribute(); + /** + * Execute the query returning a single optional attribute value. + *

+ *

Example

+ * 
{@code
+   *
+   *  Optional maybeName =
+   *    new QCustomer()
+   *      .select(name)
+   *      .id.eq(42)
+   *      .status.eq(NEW)
+   *      .findSingleAttributeOrEmpty();
+   *
+   * }
+ * + * @return an optional value for the selected property + */ + Optional findSingleAttributeOrEmpty(); + /** * Return true if this is countDistinct query. */ diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java index ce8f71a53..c4a3b965b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java @@ -305,6 +305,11 @@ final class DefaultFetchGroupQuery implements SpiFetchGroupQuery, SpiQuery throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup"); } + @Override + public Optional findSingleAttributeOrEmpty() { + throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup"); + } + @Override public boolean isCountDistinct() { throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup"); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java index 9a583fdd8..0e9e5f7d4 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java @@ -1161,7 +1161,7 @@ public class DefaultOrmQuery extends AbstractQuery implements SpiQuery { // add the rawSql statement - if any if (orderByIsEmpty()) { if (rawSql != null && rawSql.getSql() != null) { - order(rawSql.getSql().getOrderBy()); + orderBy(rawSql.getSql().getOrderBy()); } } if (checkPagingOrderBy()) { @@ -1517,7 +1517,6 @@ public class DefaultOrmQuery extends AbstractQuery implements SpiQuery { } @Override - @SuppressWarnings("unchecked") public final List findSingleAttributeList() { return server.findSingleAttributeList(this); } @@ -1533,6 +1532,11 @@ public class DefaultOrmQuery extends AbstractQuery implements SpiQuery { return !list.isEmpty() ? list.get(0) : null; } + @Override + public final Optional findSingleAttributeOrEmpty() { + return Optional.ofNullable(findSingleAttribute()); + } + @Override public final T findOne() { return server.findOne(this); diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java b/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java index bd9cd27c9..48125150e 100644 --- a/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java +++ b/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java @@ -1867,6 +1867,28 @@ public abstract class TQRootBean { return query.findSingleAttribute(); } + /** + * Execute the query returning a single optional attribute value. + *

+ *

Example

+ * 
{@code
+   *
+   *  Optional maybeName =
+   *    new QCustomer()
+   *      .select(name)
+   *      .id.eq(42)
+   *      .status.eq(NEW)
+   *      .findSingleAttributeOrEmpty();
+   *
+   * }
+ * + * @return an optional value for the selected property + */ + @Nullable + public Optional findSingleAttributeOrEmpty() { + return query.findSingleAttributeOrEmpty(); + } + /** * Execute the query processing the beans one at a time. *

diff --git a/ebean-querybean/src/test/java/org/querytest/QCustomerTest.java b/ebean-querybean/src/test/java/org/querytest/QCustomerTest.java index 1b80360bb..5c25c91e9 100644 --- a/ebean-querybean/src/test/java/org/querytest/QCustomerTest.java +++ b/ebean-querybean/src/test/java/org/querytest/QCustomerTest.java @@ -1069,6 +1069,32 @@ public class QCustomerTest { assertThat(maxDate).isNotNull(); } + @Test + public void findSingleAttributeOrEmpty() { + + Customer cust = new Customer(); + cust.setName("MaybeIExist yeah"); + cust.setStatus(Customer.Status.GOOD); + cust.setRegistered(new Date()); + cust.save(); + + Optional customerName = new QCustomer() + .select(name) + .status.eq(Customer.Status.GOOD) + .name.startsWith("MaybeIExist") + .findSingleAttributeOrEmpty(); + + assertThat(customerName).isPresent(); + + Optional customerName2 = new QCustomer() + .select(name) + .status.eq(Customer.Status.GOOD) + .name.eq("NahIDoNotExist") + .findSingleAttributeOrEmpty(); + + assertThat(customerName2).isEmpty(); + } + @Test public void testFetchByScalarValue() { diff --git a/ebean-test/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java b/ebean-test/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java index db02e5eda..19984b729 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java @@ -20,6 +20,7 @@ import org.tests.o2m.OmBasicParent; import java.sql.Date; import java.time.LocalDate; import java.util.List; +import java.util.Optional; import static org.assertj.core.api.Assertions.assertThat; @@ -139,6 +140,32 @@ class TestQuerySingleAttribute extends BaseTestCase { assertThat(name).isNotNull(); } + @Test + void findSingleAttributeOrEmpty() { + ResetBasicData.reset(); + + Query query = DB.find(Customer.class) + .select("name") + .where().eq("name", "Rob").query(); + + Optional name = query.findSingleAttributeOrEmpty(); + + assertThat(sqlOf(query)).contains("select t0.name from o_customer t0"); + assertThat(name).isPresent().contains("Rob"); + } + + @Test + void findSingleAttributeOrEmpty_when_empty() { + ResetBasicData.reset(); + + Query query = DB.find(Customer.class) + .select("name") + .where().eq("name", "I_Do_Not_ExistO!").query(); + + Optional name = query.findSingleAttributeOrEmpty(); + assertThat(name).isEmpty(); + } + @Test void findSingleAttributeList_with_join_column() { ResetBasicData.reset(); From f34e7b6003d640e24c645e1785c62e29c0408cfb Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Sat, 20 Jan 2024 22:01:30 +1300 Subject: [PATCH 11/25] Version 13.26.0 --- composites/ebean-clickhouse/pom.xml | 10 +++--- composites/ebean-cockroach/pom.xml | 10 +++--- composites/ebean-db2/pom.xml | 10 +++--- composites/ebean-h2/pom.xml | 10 +++--- composites/ebean-hana/pom.xml | 10 +++--- composites/ebean-mariadb/pom.xml | 10 +++--- composites/ebean-mysql/pom.xml | 10 +++--- composites/ebean-nuodb/pom.xml | 10 +++--- composites/ebean-oracle/pom.xml | 10 +++--- composites/ebean-postgis/pom.xml | 12 +++---- composites/ebean-postgres/pom.xml | 10 +++--- composites/ebean-sqlite/pom.xml | 10 +++--- composites/ebean-sqlserver/pom.xml | 10 +++--- composites/ebean-yugabyte/pom.xml | 10 +++--- composites/ebean/pom.xml | 12 +++---- composites/pom.xml | 2 +- ebean-api/pom.xml | 2 +- ebean-bom/pom.xml | 52 ++++++++++++++--------------- ebean-core-type/pom.xml | 4 +-- ebean-core/pom.xml | 12 +++---- ebean-ddl-generator/pom.xml | 8 ++--- ebean-jackson-mapper/pom.xml | 4 +-- ebean-postgis-types/pom.xml | 8 ++--- ebean-querybean/pom.xml | 10 +++--- ebean-redis/pom.xml | 12 +++---- ebean-spring-txn/pom.xml | 6 ++-- ebean-test/pom.xml | 12 +++---- kotlin-querybean-generator/pom.xml | 10 +++--- platforms/all/pom.xml | 28 ++++++++-------- platforms/clickhouse/pom.xml | 4 +-- platforms/db2/pom.xml | 4 +-- platforms/h2/pom.xml | 4 +-- platforms/hana/pom.xml | 4 +-- platforms/hsqldb/pom.xml | 4 +-- platforms/mariadb/pom.xml | 6 ++-- platforms/mysql/pom.xml | 4 +-- platforms/nuodb/pom.xml | 4 +-- platforms/oracle/pom.xml | 4 +-- platforms/pom.xml | 2 +- platforms/postgres/pom.xml | 4 +-- platforms/sqlanywhere/pom.xml | 4 +-- platforms/sqlite/pom.xml | 4 +-- platforms/sqlserver/pom.xml | 4 +-- pom.xml | 6 ++-- querybean-generator/pom.xml | 2 +- tests/pom.xml | 2 +- tests/test-java16/pom.xml | 8 ++--- tests/test-kotlin/pom.xml | 6 ++-- 48 files changed, 202 insertions(+), 202 deletions(-) diff --git a/composites/ebean-clickhouse/pom.xml b/composites/ebean-clickhouse/pom.xml index ead23ca35..bbcb4a7f3 100644 --- a/composites/ebean-clickhouse/pom.xml +++ b/composites/ebean-clickhouse/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.2-jakarta + 13.26.0-jakarta ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-core - 13.25.2-jakarta + 13.26.0-jakarta @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-platform-clickhouse - 13.25.2-jakarta + 13.26.0-jakarta diff --git a/composites/ebean-cockroach/pom.xml b/composites/ebean-cockroach/pom.xml index b552318d7..2f91094b1 100644 --- a/composites/ebean-cockroach/pom.xml +++ b/composites/ebean-cockroach/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.2-jakarta + 13.26.0-jakarta ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-core - 13.25.2-jakarta + 13.26.0-jakarta @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-platform-postgres - 13.25.2-jakarta + 13.26.0-jakarta diff --git a/composites/ebean-db2/pom.xml b/composites/ebean-db2/pom.xml index 5a2448995..9df029716 100644 --- a/composites/ebean-db2/pom.xml +++ b/composites/ebean-db2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.2-jakarta + 13.26.0-jakarta ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-core - 13.25.2-jakarta + 13.26.0-jakarta @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-platform-db2 - 13.25.2-jakarta + 13.26.0-jakarta diff --git a/composites/ebean-h2/pom.xml b/composites/ebean-h2/pom.xml index 4202f01cb..bcf950f43 100644 --- a/composites/ebean-h2/pom.xml +++ b/composites/ebean-h2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.2-jakarta + 13.26.0-jakarta ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-core - 13.25.2-jakarta + 13.26.0-jakarta @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-platform-h2 - 13.25.2-jakarta + 13.26.0-jakarta diff --git a/composites/ebean-hana/pom.xml b/composites/ebean-hana/pom.xml index 9a1d3d983..07bb6a2fa 100644 --- a/composites/ebean-hana/pom.xml +++ b/composites/ebean-hana/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.2-jakarta + 13.26.0-jakarta ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-core - 13.25.2-jakarta + 13.26.0-jakarta @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-platform-hana - 13.25.2-jakarta + 13.26.0-jakarta diff --git a/composites/ebean-mariadb/pom.xml b/composites/ebean-mariadb/pom.xml index 91c643d58..55d02e81f 100644 --- a/composites/ebean-mariadb/pom.xml +++ b/composites/ebean-mariadb/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.2-jakarta + 13.26.0-jakarta ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-core - 13.25.2-jakarta + 13.26.0-jakarta @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-platform-mariadb - 13.25.2-jakarta + 13.26.0-jakarta diff --git a/composites/ebean-mysql/pom.xml b/composites/ebean-mysql/pom.xml index 1fa4b5226..c46c0a66b 100644 --- a/composites/ebean-mysql/pom.xml +++ b/composites/ebean-mysql/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.2-jakarta + 13.26.0-jakarta ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-core - 13.25.2-jakarta + 13.26.0-jakarta @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-platform-mysql - 13.25.2-jakarta + 13.26.0-jakarta diff --git a/composites/ebean-nuodb/pom.xml b/composites/ebean-nuodb/pom.xml index d4664d6e0..2d57e4cf6 100644 --- a/composites/ebean-nuodb/pom.xml +++ b/composites/ebean-nuodb/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.2-jakarta + 13.26.0-jakarta ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-core - 13.25.2-jakarta + 13.26.0-jakarta @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-platform-nuodb - 13.25.2-jakarta + 13.26.0-jakarta diff --git a/composites/ebean-oracle/pom.xml b/composites/ebean-oracle/pom.xml index 079834554..9eb1b55e9 100644 --- a/composites/ebean-oracle/pom.xml +++ b/composites/ebean-oracle/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.2-jakarta + 13.26.0-jakarta ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-core - 13.25.2-jakarta + 13.26.0-jakarta @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-platform-oracle - 13.25.2-jakarta + 13.26.0-jakarta diff --git a/composites/ebean-postgis/pom.xml b/composites/ebean-postgis/pom.xml index 432e079e7..0d981bc03 100644 --- a/composites/ebean-postgis/pom.xml +++ b/composites/ebean-postgis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.2-jakarta + 13.26.0-jakarta ../.. @@ -22,13 +22,13 @@ io.ebean ebean-api - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-core - 13.25.2-jakarta + 13.26.0-jakarta @@ -47,19 +47,19 @@ io.ebean ebean-querybean - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-platform-postgres - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-postgis-types - 13.25.2-jakarta + 13.26.0-jakarta diff --git a/composites/ebean-postgres/pom.xml b/composites/ebean-postgres/pom.xml index 6ba88c756..0d9afef94 100644 --- a/composites/ebean-postgres/pom.xml +++ b/composites/ebean-postgres/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.2-jakarta + 13.26.0-jakarta ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-core - 13.25.2-jakarta + 13.26.0-jakarta @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-platform-postgres - 13.25.2-jakarta + 13.26.0-jakarta diff --git a/composites/ebean-sqlite/pom.xml b/composites/ebean-sqlite/pom.xml index 16bce0e77..c475b9546 100644 --- a/composites/ebean-sqlite/pom.xml +++ b/composites/ebean-sqlite/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.2-jakarta + 13.26.0-jakarta ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-core - 13.25.2-jakarta + 13.26.0-jakarta @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-platform-sqlite - 13.25.2-jakarta + 13.26.0-jakarta diff --git a/composites/ebean-sqlserver/pom.xml b/composites/ebean-sqlserver/pom.xml index 348bcefc0..8e5d4ccfd 100644 --- a/composites/ebean-sqlserver/pom.xml +++ b/composites/ebean-sqlserver/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.2-jakarta + 13.26.0-jakarta ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-core - 13.25.2-jakarta + 13.26.0-jakarta @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-platform-sqlserver - 13.25.2-jakarta + 13.26.0-jakarta diff --git a/composites/ebean-yugabyte/pom.xml b/composites/ebean-yugabyte/pom.xml index fb1cde0b0..3c89d4ffc 100644 --- a/composites/ebean-yugabyte/pom.xml +++ b/composites/ebean-yugabyte/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.2-jakarta + 13.26.0-jakarta ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-core - 13.25.2-jakarta + 13.26.0-jakarta @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-platform-postgres - 13.25.2-jakarta + 13.26.0-jakarta diff --git a/composites/ebean/pom.xml b/composites/ebean/pom.xml index a382b901d..4e4e08df0 100644 --- a/composites/ebean/pom.xml +++ b/composites/ebean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.2-jakarta + 13.26.0-jakarta ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-core - 13.25.2-jakarta + 13.26.0-jakarta @@ -41,7 +41,7 @@ io.ebean ebean-jackson-mapper - 13.25.2-jakarta + 13.26.0-jakarta @@ -60,13 +60,13 @@ io.ebean ebean-querybean - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-platform-all - 13.25.2-jakarta + 13.26.0-jakarta diff --git a/composites/pom.xml b/composites/pom.xml index 535238050..0a065ee2b 100644 --- a/composites/pom.xml +++ b/composites/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.2-jakarta + 13.26.0-jakarta composites diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml index a89ee0498..a266211fb 100644 --- a/ebean-api/pom.xml +++ b/ebean-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.2-jakarta + 13.26.0-jakarta ebean api diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml index 5fca7b1b9..6af8e4314 100644 --- a/ebean-bom/pom.xml +++ b/ebean-bom/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.2-jakarta + 13.26.0-jakarta ebean bom @@ -89,25 +89,25 @@ io.ebean ebean - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-api - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-core - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-core-type - 13.25.2-jakarta + 13.26.0-jakarta @@ -125,13 +125,13 @@ io.ebean ebean-jackson-mapper - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-ddl-generator - 13.25.2-jakarta + 13.26.0-jakarta @@ -155,37 +155,37 @@ io.ebean ebean-querybean - 13.25.2-jakarta + 13.26.0-jakarta io.ebean querybean-generator - 13.25.2-jakarta + 13.26.0-jakarta io.ebean kotlin-querybean-generator - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-test - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-redis - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-spring-txn - 13.25.2-jakarta + 13.26.0-jakarta @@ -193,79 +193,79 @@ io.ebean ebean-clickhouse - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-db2 - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-h2 - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-hana - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-mariadb - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-mysql - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-nuodb - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-oracle - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-postgres - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-postgis - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-postgis-types - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-sqlite - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-sqlserver - 13.25.2-jakarta + 13.26.0-jakarta diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 57367b50b..310407dc6 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.2-jakarta + 13.26.0-jakarta ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.25.2-jakarta + 13.26.0-jakarta diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 0834be897..570f2b858 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.25.2-jakarta + 13.26.0-jakarta ebean-core @@ -22,7 +22,7 @@ io.ebean ebean-api - 13.25.2-jakarta + 13.26.0-jakarta @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.25.2-jakarta + 13.26.0-jakarta @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.25.2-jakarta + 13.26.0-jakarta test io.ebean ebean-platform-postgres - 13.25.2-jakarta + 13.26.0-jakarta test io.ebean ebean-platform-sqlserver - 13.25.2-jakarta + 13.26.0-jakarta test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index 2fbcb1ef8..e5605da7e 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.2-jakarta + 13.26.0-jakarta ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.25.2-jakarta + 13.26.0-jakarta provided io.ebean ebean-core - 13.25.2-jakarta + 13.26.0-jakarta provided @@ -65,7 +65,7 @@ io.ebean ebean-platform-all - 13.25.2-jakarta + 13.26.0-jakarta test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index 1e2373eee..9da641e60 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.25.2-jakarta + 13.26.0-jakarta 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.25.2-jakarta + 13.26.0-jakarta provided diff --git a/ebean-postgis-types/pom.xml b/ebean-postgis-types/pom.xml index 1770101dd..b1bcbb10b 100644 --- a/ebean-postgis-types/pom.xml +++ b/ebean-postgis-types/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.2-jakarta + 13.26.0-jakarta ebean postgis types @@ -19,14 +19,14 @@ io.ebean ebean-platform-postgres - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-core - 13.25.2-jakarta + 13.26.0-jakarta provided @@ -62,7 +62,7 @@ io.ebean ebean-test - 13.25.2-jakarta + 13.26.0-jakarta test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 80581f1dc..84ca3462f 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.2-jakarta + 13.26.0-jakarta ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.25.2-jakarta + 13.26.0-jakarta provided @@ -63,14 +63,14 @@ io.ebean ebean-ddl-generator - 13.25.2-jakarta + 13.26.0-jakarta test io.ebean ebean-test - 13.25.2-jakarta + 13.26.0-jakarta test @@ -84,7 +84,7 @@ io.ebean querybean-generator - 13.25.2-jakarta + 13.26.0-jakarta provided diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index cef3e1f38..fab10c2ba 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.2-jakarta + 13.26.0-jakarta ebean-redis @@ -22,28 +22,28 @@ io.ebean ebean-api - 13.25.2-jakarta + 13.26.0-jakarta provided io.ebean ebean-core - 13.25.2-jakarta + 13.26.0-jakarta provided io.ebean ebean-querybean - 13.25.2-jakarta + 13.26.0-jakarta test io.ebean ebean-test - 13.25.2-jakarta + 13.26.0-jakarta test @@ -57,7 +57,7 @@ io.ebean querybean-generator - 13.25.2-jakarta + 13.26.0-jakarta provided diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index 55055649d..25a1b13aa 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.2-jakarta + 13.26.0-jakarta ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.25.2-jakarta + 13.26.0-jakarta provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.25.2-jakarta + 13.26.0-jakarta test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 37e0ac0a8..c75d23f0e 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.2-jakarta + 13.26.0-jakarta ebean test @@ -33,20 +33,20 @@ io.ebean ebean-platform-h2 - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-core - 13.25.2-jakarta + 13.26.0-jakarta provided io.ebean ebean-ddl-generator - 13.25.2-jakarta + 13.26.0-jakarta @@ -149,14 +149,14 @@ io.ebean ebean-jackson-mapper - 13.25.2-jakarta + 13.26.0-jakarta test io.ebean ebean-platform-all - 13.25.2-jakarta + 13.26.0-jakarta test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 8c29f76ba..99e3d369a 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.2-jakarta + 13.26.0-jakarta kotlin querybean generator @@ -21,7 +21,7 @@ io.ebean ebean-querybean - 13.25.2-jakarta + 13.26.0-jakarta test @@ -35,7 +35,7 @@ io.ebean ebean-core - 13.25.2-jakarta + 13.26.0-jakarta test @@ -56,14 +56,14 @@ io.ebean ebean-platform-h2 - 13.25.2-jakarta + 13.26.0-jakarta test io.ebean ebean-ddl-generator - 13.25.2-jakarta + 13.26.0-jakarta test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index 558e367c7..0207c04f4 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.2-jakarta + 13.26.0-jakarta ../.. @@ -15,67 +15,67 @@ io.ebean ebean-platform-h2 - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-platform-clickhouse - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-platform-db2 - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-platform-hana - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-platform-hsqldb - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-platform-mysql - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-platform-mariadb - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-platform-nuodb - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-platform-oracle - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-platform-postgres - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-platform-sqlanywhere - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-platform-sqlite - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-platform-sqlserver - 13.25.2-jakarta + 13.26.0-jakarta diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index 2a11ddae1..a4be18943 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.2-jakarta + 13.26.0-jakarta ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.25.2-jakarta + 13.26.0-jakarta diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index a8bf5a768..0c1264df7 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.2-jakarta + 13.26.0-jakarta ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.25.2-jakarta + 13.26.0-jakarta diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index 1bd41bb82..943a8984e 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.2-jakarta + 13.26.0-jakarta ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.25.2-jakarta + 13.26.0-jakarta @@ -193,79 +193,79 @@ io.ebean ebean-clickhouse - 13.26.0-jakarta + 13.26.1-jakarta io.ebean ebean-db2 - 13.26.0-jakarta + 13.26.1-jakarta io.ebean ebean-h2 - 13.26.0-jakarta + 13.26.1-jakarta io.ebean ebean-hana - 13.26.0-jakarta + 13.26.1-jakarta io.ebean ebean-mariadb - 13.26.0-jakarta + 13.26.1-jakarta io.ebean ebean-mysql - 13.26.0-jakarta + 13.26.1-jakarta io.ebean ebean-nuodb - 13.26.0-jakarta + 13.26.1-jakarta io.ebean ebean-oracle - 13.26.0-jakarta + 13.26.1-jakarta io.ebean ebean-postgres - 13.26.0-jakarta + 13.26.1-jakarta io.ebean ebean-postgis - 13.26.0-jakarta + 13.26.1-jakarta io.ebean ebean-postgis-types - 13.26.0-jakarta + 13.26.1-jakarta io.ebean ebean-sqlite - 13.26.0-jakarta + 13.26.1-jakarta io.ebean ebean-sqlserver - 13.26.0-jakarta + 13.26.1-jakarta diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 310407dc6..4cc1904cf 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-jakarta + 13.26.1-jakarta ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.26.0-jakarta + 13.26.1-jakarta diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 570f2b858..3fa2644bd 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.26.0-jakarta + 13.26.1-jakarta ebean-core @@ -22,7 +22,7 @@ io.ebean ebean-api - 13.26.0-jakarta + 13.26.1-jakarta @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.26.0-jakarta + 13.26.1-jakarta @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.26.0-jakarta + 13.26.1-jakarta test io.ebean ebean-platform-postgres - 13.26.0-jakarta + 13.26.1-jakarta test io.ebean ebean-platform-sqlserver - 13.26.0-jakarta + 13.26.1-jakarta test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index e5605da7e..0f0bdaa30 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-jakarta + 13.26.1-jakarta ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.26.0-jakarta + 13.26.1-jakarta provided io.ebean ebean-core - 13.26.0-jakarta + 13.26.1-jakarta provided @@ -65,7 +65,7 @@ io.ebean ebean-platform-all - 13.26.0-jakarta + 13.26.1-jakarta test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index 9da641e60..736987ba9 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.26.0-jakarta + 13.26.1-jakarta 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.26.0-jakarta + 13.26.1-jakarta provided diff --git a/ebean-postgis-types/pom.xml b/ebean-postgis-types/pom.xml index b1bcbb10b..2ea91e5b5 100644 --- a/ebean-postgis-types/pom.xml +++ b/ebean-postgis-types/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-jakarta + 13.26.1-jakarta ebean postgis types @@ -19,14 +19,14 @@ io.ebean ebean-platform-postgres - 13.26.0-jakarta + 13.26.1-jakarta io.ebean ebean-core - 13.26.0-jakarta + 13.26.1-jakarta provided @@ -62,7 +62,7 @@ io.ebean ebean-test - 13.26.0-jakarta + 13.26.1-jakarta test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 84ca3462f..91350fadc 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-jakarta + 13.26.1-jakarta ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.26.0-jakarta + 13.26.1-jakarta provided @@ -63,14 +63,14 @@ io.ebean ebean-ddl-generator - 13.26.0-jakarta + 13.26.1-jakarta test io.ebean ebean-test - 13.26.0-jakarta + 13.26.1-jakarta test @@ -84,7 +84,7 @@ io.ebean querybean-generator - 13.26.0-jakarta + 13.26.1-jakarta provided diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index fab10c2ba..0c5f5def6 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-jakarta + 13.26.1-jakarta ebean-redis @@ -22,28 +22,28 @@ io.ebean ebean-api - 13.26.0-jakarta + 13.26.1-jakarta provided io.ebean ebean-core - 13.26.0-jakarta + 13.26.1-jakarta provided io.ebean ebean-querybean - 13.26.0-jakarta + 13.26.1-jakarta test io.ebean ebean-test - 13.26.0-jakarta + 13.26.1-jakarta test @@ -57,7 +57,7 @@ io.ebean querybean-generator - 13.26.0-jakarta + 13.26.1-jakarta provided diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index 25a1b13aa..f9e9e5eec 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-jakarta + 13.26.1-jakarta ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.26.0-jakarta + 13.26.1-jakarta provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.26.0-jakarta + 13.26.1-jakarta test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index c75d23f0e..cc8f2e3ab 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-jakarta + 13.26.1-jakarta ebean test @@ -33,20 +33,20 @@ io.ebean ebean-platform-h2 - 13.26.0-jakarta + 13.26.1-jakarta io.ebean ebean-core - 13.26.0-jakarta + 13.26.1-jakarta provided io.ebean ebean-ddl-generator - 13.26.0-jakarta + 13.26.1-jakarta @@ -149,14 +149,14 @@ io.ebean ebean-jackson-mapper - 13.26.0-jakarta + 13.26.1-jakarta test io.ebean ebean-platform-all - 13.26.0-jakarta + 13.26.1-jakarta test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 99e3d369a..e87afd343 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-jakarta + 13.26.1-jakarta kotlin querybean generator @@ -21,7 +21,7 @@ io.ebean ebean-querybean - 13.26.0-jakarta + 13.26.1-jakarta test @@ -35,7 +35,7 @@ io.ebean ebean-core - 13.26.0-jakarta + 13.26.1-jakarta test @@ -56,14 +56,14 @@ io.ebean ebean-platform-h2 - 13.26.0-jakarta + 13.26.1-jakarta test io.ebean ebean-ddl-generator - 13.26.0-jakarta + 13.26.1-jakarta test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index 0207c04f4..15db1ec5e 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-jakarta + 13.26.1-jakarta ../.. @@ -15,67 +15,67 @@ io.ebean ebean-platform-h2 - 13.26.0-jakarta + 13.26.1-jakarta io.ebean ebean-platform-clickhouse - 13.26.0-jakarta + 13.26.1-jakarta io.ebean ebean-platform-db2 - 13.26.0-jakarta + 13.26.1-jakarta io.ebean ebean-platform-hana - 13.26.0-jakarta + 13.26.1-jakarta io.ebean ebean-platform-hsqldb - 13.26.0-jakarta + 13.26.1-jakarta io.ebean ebean-platform-mysql - 13.26.0-jakarta + 13.26.1-jakarta io.ebean ebean-platform-mariadb - 13.26.0-jakarta + 13.26.1-jakarta io.ebean ebean-platform-nuodb - 13.26.0-jakarta + 13.26.1-jakarta io.ebean ebean-platform-oracle - 13.26.0-jakarta + 13.26.1-jakarta io.ebean ebean-platform-postgres - 13.26.0-jakarta + 13.26.1-jakarta io.ebean ebean-platform-sqlanywhere - 13.26.0-jakarta + 13.26.1-jakarta io.ebean ebean-platform-sqlite - 13.26.0-jakarta + 13.26.1-jakarta io.ebean ebean-platform-sqlserver - 13.26.0-jakarta + 13.26.1-jakarta diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index a4be18943..54c354d03 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-jakarta + 13.26.1-jakarta ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.26.0-jakarta + 13.26.1-jakarta diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index 0c1264df7..026a355e8 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-jakarta + 13.26.1-jakarta ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.26.0-jakarta + 13.26.1-jakarta diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index 943a8984e..62e68bbf1 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-jakarta + 13.26.1-jakarta ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.26.0-jakarta + 13.26.1-jakarta