Merge pull request #3223 from FOCONIS/fix-find-props-for-id-class

Regression of #3133 with formula properties

ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedFactory.java

@@ -41,7 +41,7 @@ final class MatchedImportedFactory {
     }
     // match on property name
     for (BeanProperty beanProperty : desc.propertiesBaseScalar()) {
-      if (prop.name().equals(beanProperty.name())) {
+      if (!beanProperty.isFormula() && prop.name().equals(beanProperty.name())) {
         return new MatchedImportedScalar(prop, beanProperty);
       }
     }

ebean-test/src/test/java/org/tests/model/composite/DataWithFormula.java

@@ -0,0 +1,65 @@
+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;
+
+@Entity
+
+public class DataWithFormula {
+
+  private static final long serialVersionUID = 1L;
+
+  @EmbeddedId
+  private DataWithFormulaKey id;
+
+
+  @Formula(select = "${ta}.meta_key")
+  private String metaKey;
+
+  @Formula(select = "${ta}.value_index")
+  private Integer valueIndex;
+
+  @ManyToOne
+  @JoinColumn(name = "main_id", insertable = false, nullable = false)
+  private DataWithFormulaMain main;
+
+  @Index
+  private String stringValue;
+
+  public DataWithFormulaKey getId() {
+    return id;
+  }
+
+  public void setId(DataWithFormulaKey id) {
+    this.id = id;
+  }
+
+  public String getMetaKey() {
+    return metaKey;
+  }
+
+  public void setMetaKey(String metaKey) {
+    this.metaKey = metaKey;
+  }
+
+  public Integer getValueIndex() {
+    return valueIndex;
+  }
+
+  public void setValueIndex(Integer valueIndex) {
+    this.valueIndex = valueIndex;
+  }
+
+  public String getStringValue() {
+    return stringValue;
+  }
+
+  public void setStringValue(String stringValue) {
+    this.stringValue = stringValue;
+  }
+}

ebean-test/src/test/java/org/tests/model/composite/DataWithFormulaKey.java

@@ -0,0 +1,59 @@
+package org.tests.model.composite;
+
+import io.ebean.annotation.NotNull;
+import jakarta.persistence.Embeddable;
+
+import java.util.Objects;
+import java.util.UUID;
+
+@Embeddable
+public class DataWithFormulaKey {
+
+  private static final long serialVersionUID = 1L;
+
+  @NotNull
+  private UUID mainId;
+
+  @NotNull
+  private String metaKey = "";
+
+  @NotNull
+  private Integer valueIndex = 0;
+
+  public UUID getMainId() {
+    return mainId;
+  }
+
+  public void setMainId(UUID mainId) {
+    this.mainId = mainId;
+  }
+
+  public String getMetaKey() {
+    return metaKey;
+  }
+
+  public void setMetaKey(String metaKey) {
+    this.metaKey = metaKey;
+  }
+
+  public Integer getValueIndex() {
+    return valueIndex;
+  }
+
+  public void setValueIndex(Integer valueIndex) {
+    this.valueIndex = valueIndex;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    DataWithFormulaKey that = (DataWithFormulaKey) o;
+    return Objects.equals(mainId, that.mainId) && Objects.equals(metaKey, that.metaKey) && Objects.equals(valueIndex, that.valueIndex);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(mainId, metaKey, valueIndex);
+  }
+}

ebean-test/src/test/java/org/tests/model/composite/DataWithFormulaMain.java

@@ -0,0 +1,44 @@
+package org.tests.model.composite;
+
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+
+import java.util.List;
+import java.util.UUID;
+
+@Entity
+public class DataWithFormulaMain {
+  @Id
+  private UUID id;
+
+  private String title;
+
+  @OneToMany(cascade = CascadeType.ALL, mappedBy = "main")
+  private List<DataWithFormula> metaData;
+
+  public UUID getId() {
+    return id;
+  }
+
+  public void setId(UUID id) {
+    this.id = id;
+  }
+
+  public String getTitle() {
+    return title;
+  }
+
+  public void setTitle(String title) {
+    this.title = title;
+  }
+
+  public List<DataWithFormula> getMetaData() {
+    return metaData;
+  }
+
+  public void setMetaData(List<DataWithFormula> metaData) {
+    this.metaData = metaData;
+  }
+}

ebean-test/src/test/java/org/tests/model/composite/TestDataWithFormula.java

@@ -0,0 +1,43 @@
+package org.tests.model.composite;
+
+import io.ebean.DB;
+import io.ebean.test.LoggedSql;
+import io.ebean.xtest.BaseTestCase;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.UUID;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+
+public class TestDataWithFormula extends BaseTestCase {
+
+  @Test
+  public void test1() {
+
+
+    DataWithFormulaMain main = new DataWithFormulaMain();
+    main.setId(UUID.randomUUID());
+    main.setTitle("Main");
+
+    DataWithFormulaKey key = new DataWithFormulaKey();
+    key.setMainId(main.getId());
+    key.setMetaKey("meta");
+    key.setValueIndex(42);
+    DataWithFormula data = new DataWithFormula();
+    data.setId(key);
+    data.setStringValue("SomeValue");
+    main.setMetaData(List.of(data));
+
+    LoggedSql.start();
+    DB.save(main);
+    List<String> sqls = LoggedSql.stop();
+
+    assertThat(sqls).hasSize(3);
+    assertThat(sqls.get(0)).contains("insert into data_with_formula_main (id, title) values (?,?);"); // main
+    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");
+
+  }
+}