From dc7b73fc25265a4dccca74b222bee3f240cb0aff Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Tue, 19 Sep 2023 23:03:30 +1200 Subject: [PATCH] Follow up #3223 - modify test, could use @Column(insertable = false, updatable = false) instead of @Formula --- .../java/org/tests/model/composite/DataWithFormula.java | 7 +++---- .../org/tests/model/composite/TestDataWithFormula.java | 8 ++++++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ebean-test/src/test/java/org/tests/model/composite/DataWithFormula.java b/ebean-test/src/test/java/org/tests/model/composite/DataWithFormula.java index 57e11b5a3..7bfb45f16 100644 --- a/ebean-test/src/test/java/org/tests/model/composite/DataWithFormula.java +++ b/ebean-test/src/test/java/org/tests/model/composite/DataWithFormula.java @@ -3,10 +3,7 @@ package org.tests.model.composite; import io.ebean.annotation.Formula; import io.ebean.annotation.Index; -import jakarta.persistence.EmbeddedId; -import jakarta.persistence.Entity; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; +import jakarta.persistence.*; @Entity public class DataWithFormula { @@ -14,9 +11,11 @@ public class DataWithFormula { @EmbeddedId private DataWithFormulaKey id; + // @Column(insertable = false, updatable = false) @Formula(select = "${ta}.meta_key") private String metaKey; + // @Column(insertable = false, updatable = false) @Formula(select = "${ta}.value_index") private Integer valueIndex; diff --git a/ebean-test/src/test/java/org/tests/model/composite/TestDataWithFormula.java b/ebean-test/src/test/java/org/tests/model/composite/TestDataWithFormula.java index afdca7bb1..839dc2997 100644 --- a/ebean-test/src/test/java/org/tests/model/composite/TestDataWithFormula.java +++ b/ebean-test/src/test/java/org/tests/model/composite/TestDataWithFormula.java @@ -35,5 +35,13 @@ class TestDataWithFormula extends BaseTestCase { assertThat(sqls.get(1)).contains("insert into data_with_formula (main_id, meta_key, value_index, string_value) values (?,?,?,?)"); // main assertThat(sqls.get(2)).contains("-- bind"); + + DataWithFormula found = DB.find(DataWithFormula.class) + .where().idEq(key) + .findOne(); + + assertThat(found.getStringValue()).isEqualTo("SomeValue"); + assertThat(found.getId().getMainId()).isEqualTo(key.getMainId()); + assertThat(found.getMetaKey()).isEqualTo(key.getMetaKey()); } }