Merge pull request apache#358 from datastax/java688

adutra · adutra · commit 2e811de306f9 · 2015-06-11T14:47:06.000+02:00
JAVA-688 : QueryBuilder doesn't serialize raw strings
diff --git a/driver-core/src/main/java/com/datastax/driver/core/querybuilder/Utils.java b/driver-core/src/main/java/com/datastax/driver/core/querybuilder/Utils.java
@@ -59,11 +59,14 @@ static StringBuilder joinAndAppendValues(StringBuilder sb, String separator, Lis
         return sb;
     }
 
-    // Returns null if it's not really serializable (function call, bind markers, ...)
+    // Returns false if it's not really serializable (function call, bind markers, ...)
     static boolean isSerializable(Object value) {
         if (value instanceof BindMarker || value instanceof FCall || value instanceof CName)
             return false;
 
+        if (value instanceof RawString)
+            return false;
+
         // We also don't serialize fixed size number types. The reason is that if we do it, we will
         // force a particular size (4 bytes for ints, ...) and for the query builder, we don't want
         // users to have to bother with that.
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
@@ -18,6 +18,7 @@
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.net.InetAddress;
+import java.nio.ByteBuffer;
 import java.util.*;
 
 import com.google.common.collect.ImmutableList;
@@ -769,4 +770,11 @@ public void should_handle_nested_collections() {
         statement = update("foo").with(prependAll("l", list)).where(eq("k", 1));
         assertThat(statement.toString()).isEqualTo(query);
     }
+
+    @Test(groups = "unit")
+    public void should_not_serialize_raw_query_values() {
+        RegularStatement select = select().from("test").where(gt("i", raw("1")));
+        assertThat(select.getQueryString()).doesNotContain("?");
+        assertThat(select.getValues(ProtocolVersion.V3)).isNull();
+    }
 }
