Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions ebean-test/src/test/java/org/tests/model/array/EArrayBean.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
import io.ebean.annotation.DbArray;
import io.ebean.annotation.NotNull;

import jakarta.persistence.Basic;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import jakarta.persistence.Version;
Expand Down Expand Up @@ -51,6 +53,17 @@ enum Status {
@DbArray(nullable = false)
List<Status> statuses = new ArrayList<>();

@DbArray
@Column(nullable = false)
List<Integer> progress = new ArrayList<>();

@DbArray(nullable = false)
List<Integer> progressDbArrayNullableFalse = new ArrayList<>();

@DbArray
@Basic(optional = false)
List<Integer> progressBasicOptionalFalse = new ArrayList<>();

@DbArray
List<VarcharEnum> vcEnums = new ArrayList<>();

Expand Down Expand Up @@ -149,6 +162,30 @@ public void setStatuses(List<Status> statuses) {
this.statuses = statuses;
}

public List<Integer> getProgress() {
return progress;
}

public void setProgress(List<Integer> progress) {
this.progress = progress;
}

public List<Integer> getProgressDbArrayNullableFalse() {
return progressDbArrayNullableFalse;
}

public void setProgressDbArrayNullableFalse(List<Integer> progressDbArrayNullableFalse) {
this.progressDbArrayNullableFalse = progressDbArrayNullableFalse;
}

public List<Integer> getProgressBasicOptionalFalse() {
return progressBasicOptionalFalse;
}

public void setProgressBasicOptionalFalse(List<Integer> progressBasicOptionalFalse) {
this.progressBasicOptionalFalse = progressBasicOptionalFalse;
}

public List<VarcharEnum> getVcEnums() {
return vcEnums;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.tests.model.array;

import io.ebean.*;
import io.ebeaninternal.server.deploy.BeanProperty;
import io.ebean.xtest.BaseTestCase;
import io.ebean.xtest.ForPlatform;
import io.ebean.xtest.IgnorePlatform;
Expand Down Expand Up @@ -29,6 +30,12 @@ class TestDbArray_basic extends BaseTestCase {
void insert() throws SQLException {
DB.find(EArrayBean.class).delete();
bean.setName("some stuff");
bean.getProgress().add(1);
bean.getProgress().add(2);
bean.getProgressDbArrayNullableFalse().add(3);
bean.getProgressDbArrayNullableFalse().add(4);
bean.getProgressBasicOptionalFalse().add(5);
bean.getProgressBasicOptionalFalse().add(6);
assertThat(bean.getStatuses()).as("DbArray is auto initialised").isNotNull();
assertThat(bean.getIntEnums()).as("DbArray is auto initialised").isNotNull();
assertThat(bean.getUids()).as("DbArray is auto initialised").isNotNull();
Expand Down Expand Up @@ -68,6 +75,9 @@ void insert() throws SQLException {
found = DB.find(EArrayBean.class, bean.getId());

assertThat(found.getPhoneNumbers()).containsExactly("4321", "9823");
assertThat(found.getProgress()).containsExactly(1, 2);
assertThat(found.getProgressDbArrayNullableFalse()).containsExactly(3, 4);
assertThat(found.getProgressBasicOptionalFalse()).containsExactly(5, 6);
assertThat(found.getDoubs()).hasSize(2);
assertThat(found.getFloats()).hasSize(2);
assertThat(found.getTimes()).hasSize(2);
Expand Down Expand Up @@ -130,6 +140,36 @@ void insert() throws SQLException {
update_when_dirty();
}

@Test
@IgnorePlatform(Platform.HANA)
void columnNullableFalseIsAppliedToDbArray() {
BeanProperty progress = spiEbeanServer()
.descriptor(EArrayBean.class)
.findProperty("progress");
BeanProperty progressDbArrayNullableFalse = spiEbeanServer()
.descriptor(EArrayBean.class)
.findProperty("progressDbArrayNullableFalse");
BeanProperty progressBasicOptionalFalse = spiEbeanServer()
.descriptor(EArrayBean.class)
.findProperty("progressBasicOptionalFalse");

assertThat(progress.isNullable()).isFalse();
assertThat(progressDbArrayNullableFalse.isNullable()).isFalse();
assertThat(progressBasicOptionalFalse.isNullable()).isFalse();

EArrayBean bean = new EArrayBean();
bean.setName("non-null progress");
bean.setProgress(List.of(10, 20));
bean.setProgressDbArrayNullableFalse(List.of(30, 40));
bean.setProgressBasicOptionalFalse(List.of(50, 60));
DB.save(bean);

EArrayBean found = DB.find(EArrayBean.class, bean.getId());
assertThat(found.getProgress()).containsExactly(10, 20);
assertThat(found.getProgressDbArrayNullableFalse()).containsExactly(30, 40);
assertThat(found.getProgressBasicOptionalFalse()).containsExactly(50, 60);
}

//@Test//(dependsOnMethods = "insert")
void json_parse_format() {

Expand Down
Loading