PreparedStatement.toString() now includes the parameter values in a human readable format.

h2/src/main/org/h2/expression/Expression.java

@@ -153,7 +153,7 @@ public abstract class Expression {
     /**
      * Is the value of a parameter set.
      *
-     * @return if it is set
+     * @return true if set
      */
     public boolean isValueSet() {
         return false;

h2/src/main/org/h2/expression/ParameterInterface.java

@@ -35,6 +35,13 @@ public interface ParameterInterface {
      */
     void checkSet();
 
+    /**
+     * Is the value of a parameter set.
+     *
+     * @return true if set
+     */
+    boolean isValueSet();
+
     /**
      * Get the expected data type of the parameter if no value is set, or the
      * data type of the value if one is set.

h2/src/main/org/h2/expression/ParameterRemote.java

@@ -46,6 +46,10 @@ public class ParameterRemote implements ParameterInterface {
         }
     }
 
+    public boolean isValueSet() {
+        return value != null;
+    }
+
     public int getType() {
         return value == null ? dataType : value.getType();
     }

h2/src/main/org/h2/message/Trace.java

@@ -12,6 +12,7 @@ import org.h2.constant.SysProperties;
 import org.h2.expression.ParameterInterface;
 import org.h2.util.StatementBuilder;
 import org.h2.util.StringUtils;
+import org.h2.value.Value;
 
 /**
  * This class represents a trace module.
@@ -216,13 +217,24 @@ public class Trace {
         if (parameters.size() == 0) {
             return "";
         }
-        StatementBuilder buff = new StatementBuilder(" {");
+        StatementBuilder buff = new StatementBuilder();
         int i = 0;
+        boolean params = false;
         for (ParameterInterface p : parameters) {
+            if (p.isValueSet()) {
+                if (!params) {
+                    buff.append(" {");
+                    params = true;
+                }
                 buff.appendExceptFirst(", ");
-            buff.append(++i).append(": ").append(p.getParamValue().getTraceSQL());
+                Value v = p.getParamValue();
+                buff.append(++i).append(": ").append(v.getTraceSQL());
+            }
+        }
+        if (params) {
+            buff.append('}');
         }
-        return buff.append('}').toString();
+        return buff.toString();
     }
 
     /**

h2/src/test/org/h2/test/jdbc/TestPreparedStatement.java

@@ -42,7 +42,6 @@ public class TestPreparedStatement extends TestBase {
     }
 
     public void test() throws Exception {
-
         deleteDb("preparedStatement");
         Connection conn = getConnection("preparedStatement");
         testToString(conn);
@@ -84,7 +83,7 @@ public class TestPreparedStatement extends TestBase {
         PreparedStatement prep = conn.prepareStatement("call 1");
         assertTrue(prep.toString().endsWith(": call 1"));
         prep = conn.prepareStatement("call ?");
-        assertTrue(prep.toString().endsWith(": call ? {1: NULL}"));
+        assertTrue(prep.toString().endsWith(": call ?"));
         prep.setString(1, "Hello World");
         assertTrue(prep.toString().endsWith(": call ? {1: 'Hello World'}"));
     }