From 962d7f601d83665082be734f6847129fe4d7a687 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Mon, 27 Jul 2015 20:59:40 +1200
Subject: [PATCH] #356 - ENH: Change to Binder logging such that the value in
 the bind log is the converted/bound value

---
 .../java/com/avaje/ebeaninternal/server/persist/Binder.java | 4 +++-
 .../avaje/ebeaninternal/server/query/CQueryPredicates.java  | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/Binder.java b/src/main/java/com/avaje/ebeaninternal/server/persist/Binder.java
index 235503503..0bd8fc391 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/persist/Binder.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/persist/Binder.java
@@ -142,11 +142,12 @@ public class Binder {
   /**
    * Bind an Object with unknown data type.
    */
-  public void bindObject(DataBind dataBind, Object value) throws SQLException {
+  public Object bindObject(DataBind dataBind, Object value) throws SQLException {
 
     if (value == null) {
       // null of unknown type
       bindObject(dataBind, null, Types.OTHER);
+      return null;
 
     } else {
 
@@ -163,6 +164,7 @@ public class Binder {
 
       int dbType = type.getJdbcType();
       bindObject(dataBind, value, dbType);
+      return value;
     }
   }
 
diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryPredicates.java b/src/main/java/com/avaje/ebeaninternal/server/query/CQueryPredicates.java
index 2c0a6bf7b..3b43b632b 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryPredicates.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/query/CQueryPredicates.java
@@ -156,7 +156,7 @@ public class CQueryPredicates {
 
       for (int i = 0; i < whereExprBindValues.size(); i++) {
         Object bindValue = whereExprBindValues.get(i);
-        binder.bindObject(dataBind, bindValue);
+        bindValue = binder.bindObject(dataBind, bindValue);
         if (i > 0 || idValue != null) {
           bindLog.append(",");
         }
@@ -168,7 +168,7 @@ public class CQueryPredicates {
 
       for (int i = 0; i < filterManyExprBindValues.size(); i++) {
         Object bindValue = filterManyExprBindValues.get(i);
-        binder.bindObject(dataBind, bindValue);
+        bindValue = binder.bindObject(dataBind, bindValue);
         if (i > 0 || idValue != null) {
           bindLog.append(",");
         }
@@ -198,7 +198,7 @@ public class CQueryPredicates {
       bindLog.append(" having ");
       for (int i = 0; i < havingExprBindValues.size(); i++) {
         Object bindValue = havingExprBindValues.get(i);
-        binder.bindObject(dataBind, bindValue);
+        bindValue = binder.bindObject(dataBind, bindValue);
         if (i > 0) {
           bindLog.append(",");
         }