JAVA-1272: BuiltStatement not able to print its query string if it contains mapped UDTs.

Alexandre Dutra · olim7t · commit 9b9f0599ff2d · 2016-09-16T10:45:38.000-07:00
Conflicts:
	changelog/README.md
	driver-core/src/main/java/com/datastax/driver/core/querybuilder/BuiltStatement.java
	driver-core/src/test/java/com/datastax/driver/core/querybuilder/QueryBuilderTest.java
diff --git a/driver-core/src/main/java/com/datastax/driver/core/querybuilder/BuiltStatement.java b/driver-core/src/main/java/com/datastax/driver/core/querybuilder/BuiltStatement.java
@@ -292,14 +292,19 @@ public Boolean isIdempotent() {
     @Override
     public String toString() {
         try {
-            if (forceNoValues) {
+            if (forceNoValues)
                 return getQueryString();
+            // 1) try first with all values inlined (will not work if some values require custom codecs,
+            // or if the required codecs are registered in a different CodecRegistry instance than the default one)
+            return maybeAddSemicolon(buildQueryString(null, CodecRegistry.DEFAULT_INSTANCE)).toString();
+        } catch (RuntimeException e1) {
+            // 2) try next with bind markers for all values to avoid usage of custom codecs
+            try {
+                return maybeAddSemicolon(buildQueryString(new ArrayList<Object>(), CodecRegistry.DEFAULT_INSTANCE)).toString();
+            } catch (RuntimeException e2) {
+                // Ugly but we have absolutely no context to get the registry from
+                return String.format("built query (could not generate with default codec registry: %s)", e2.getMessage());
             }
-            StringBuilder queryString = buildQueryString(null, CodecRegistry.DEFAULT_INSTANCE);
-            return maybeAddSemicolon(queryString).toString();
-        } catch (CodecNotFoundException e) {
-            // Ugly but we have absolutely no context to get the registry from
-            return String.format("built query (could not generate with default codec registry: %s)", e.getMessage());
         }
     }
 
diff --git a/driver-core/src/test/java/com/datastax/driver/core/querybuilder/QueryBuilderTest.java b/driver-core/src/test/java/com/datastax/driver/core/querybuilder/QueryBuilderTest.java
@@ -999,4 +999,63 @@ public void should_include_original_cause_when_arguments_invalid() {
         }
     }
 
+    static class Foo {
+        int bar;
+
+        public Foo(int bar) {
+            this.bar = bar;
+        }
+    }
+
+    static class FooCodec extends TypeCodec<Foo> {
+
+        public FooCodec() {
+            super(DataType.cint(), Foo.class);
+        }
+
+        @Override
+        public ByteBuffer serialize(Foo value, ProtocolVersion protocolVersion) throws InvalidTypeException {
+            // not relevant for this test
+            return null;
+        }
+
+        @Override
+        public Foo deserialize(ByteBuffer bytes, ProtocolVersion protocolVersion) throws InvalidTypeException {
+            // not relevant for this test
+            return null;
+        }
+
+        @Override
+        public Foo parse(String value) throws InvalidTypeException {
+            // not relevant for this test
+            return null;
+        }
+
+        @Override
+        public String format(Foo foo) throws InvalidTypeException {
+            return Integer.toString(foo.bar);
+        }
+    }
+
+    /**
+     * Ensures that a statement can be printed with and without
+     * a required custom codec.
+     * The expectation is that if the codec is not registered,
+     * then the query string should contain bind markers for all variables;
+     * if however all codecs are properly registered, then
+     * the query string should contain all variables inlined and formatted properly.
+     *
+     * @jira_ticket JAVA-1272
+     */
+    @Test(groups = "unit")
+    public void should_inline_custom_codec() throws Exception {
+        assertThat(
+                insertInto("users").value("id", new Foo(42)).toString())
+                .isEqualTo("INSERT INTO users (id) VALUES (?);");
+        CodecRegistry.DEFAULT_INSTANCE.register(new FooCodec());
+        assertThat(
+                insertInto("users").value("id", new Foo(42)).toString())
+                .isEqualTo("INSERT INTO users (id) VALUES (42);");
+    }
+
 }
