From 8e02dedf9ff9e748fe5b5a82ed62d6ff45623256 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Fri, 14 Oct 2022 08:14:12 +1300 Subject: [PATCH] #2856 - @DbArray - improve bind logging, non-null arrays auto bind null to [] so improve bind logging to reflect that --- .../java/io/ebeaninternal/server/deploy/BeanProperty.java | 4 ++++ .../java/io/ebeaninternal/server/persist/dml/DmlHandler.java | 2 ++ 2 files changed, 6 insertions(+) diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java index 99765ff5e..8c1b208df 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java @@ -927,6 +927,10 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { return alreadyDirty || value != null && scalarType.isDirty(value); } + public boolean isArrayType() { + return scalarType instanceof ScalarTypeArray; + } + /** * Return the scalarType. */ diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java index c7845c6f8..58ec931fc 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java @@ -217,6 +217,8 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest { } if (prop.isLob()) { bindLog.append("[LOB]"); + } else if (value == null && !prop.isNullable() && prop.isArrayType()) { + bindLog.append("[]"); // null bound as empty array } else { String sv = String.valueOf(value); if (sv.length() > 50) {