diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
index c20c0ad86..031aef1d5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
@@ -171,6 +171,11 @@ public final class DeployUtil {
* Set the DbArray type (effectively Postgres only).
*/
void setDbArray(DeployBeanProperty prop, DbArray dbArray) {
+ if (!dbArray.nullable()) {
+ // Non-nullable ScalarTypeArray's will auto bind null to empty array, we need to
+ // set nullable(false) before the ScalarTypeArray is determined and assigned
+ prop.setNullable(false);
+ }
Class> type = prop.getPropertyType();
ScalarType> scalarType = typeManager.getArrayScalarType(type, prop.getGenericType(), prop.isNullable());
if (scalarType == null) {
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index b9d1615b0..74cf66328 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -272,7 +272,7 @@
true
- io.ebean.tile:enhancement:13.6.5
+ io.ebean.tile:enhancement:13.10.0
diff --git a/ebean-test/src/test/java/org/tests/model/array/EArrayBean.java b/ebean-test/src/test/java/org/tests/model/array/EArrayBean.java
index 2dcd62e76..a9e3f4431 100644
--- a/ebean-test/src/test/java/org/tests/model/array/EArrayBean.java
+++ b/ebean-test/src/test/java/org/tests/model/array/EArrayBean.java
@@ -46,14 +46,14 @@ public class EArrayBean {
@DbArray
List floats;
- @DbArray
- List statuses;
+ @DbArray(nullable = false)
+ List statuses = new ArrayList<>();
@DbArray
List vcEnums = new ArrayList<>();
- @DbArray
- List intEnums = new ArrayList<>();
+ @DbArray @NotNull
+ List intEnums;
@DbArray
Set status2;
diff --git a/ebean-test/src/test/java/org/tests/model/array/TestDbArray_basic.java b/ebean-test/src/test/java/org/tests/model/array/TestDbArray_basic.java
index 2f04f31ac..aee5a954f 100644
--- a/ebean-test/src/test/java/org/tests/model/array/TestDbArray_basic.java
+++ b/ebean-test/src/test/java/org/tests/model/array/TestDbArray_basic.java
@@ -28,6 +28,8 @@ class TestDbArray_basic extends BaseTestCase {
DB.find(EArrayBean.class).delete();
bean.setName("some stuff");
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();
List phNumbers = bean.getPhoneNumbers();
phNumbers.add("4321");
@@ -170,7 +172,26 @@ class TestDbArray_basic extends BaseTestCase {
bean.setOtherIds(null);
DB.save(bean);
- DB.delete(bean);
+
+ EArrayBean found = DB.find(EArrayBean.class, bean.getId());
+ assertThat(found.getPhoneNumbers()).isNull();
+ assertThat(found.getStatuses()).isEmpty();
+ assertThat(found.getIntEnums()).isEmpty();
+ assertThat(found.getUids()).isEmpty();
+
+ found.setName("some nulls 2");
+ DB.save(found);
+
+ EArrayBean found2 = DB.find(EArrayBean.class)
+ .where()
+ .eq("id", bean.getId())
+ .isNull("phoneNumbers")
+ .findOne();
+
+ assertThat(found2).isNotNull();
+ assertThat(found2.getPhoneNumbers()).isNull();
+
+ DB.delete(found);
}
@Test
diff --git a/ebean-test/src/test/resources/ebean.mf b/ebean-test/src/test/resources/ebean.mf
index fc2fd6902..9bb12d1a5 100644
--- a/ebean-test/src/test/resources/ebean.mf
+++ b/ebean-test/src/test/resources/ebean.mf
@@ -4,4 +4,5 @@ entity-packages: org,misc
transactional-packages: org
querybean-packages: none
synthetic: true
+allow-nullable-dbarray: true