Merge pull request apache#279 from datastax/java655

olim7t · olim7t · commit e20f0eeb3e01 · 2015-03-06T17:55:49.000-08:00
JAVA-655 Quote single quotes contained in table comments in asCQLQuery method.
diff --git a/driver-core/CHANGELOG.rst b/driver-core/CHANGELOG.rst
@@ -14,6 +14,8 @@ CHANGELOG
 - [improvement] Use List<?> instead of List<Object> in QueryBuilder API
   (JAVA-631)
 - [improvement] Exclude Netty POM from META-INF in shaded JAR (JAVA-654)
+- [bug] Quote single quotes contained in table comments in asCQLQuery method
+  (JAVA-655)
 
 Merged from 2.0.9_fixes branch:
 
diff --git a/driver-core/src/main/java/com/datastax/driver/core/TableMetadata.java b/driver-core/src/main/java/com/datastax/driver/core/TableMetadata.java
@@ -413,7 +413,7 @@ private String asCQLQuery(boolean formatted) {
         and(sb, formatted).append("bloom_filter_fp_chance = ").append(options.bfFpChance);
         and(sb, formatted).append("caching = '").append(options.caching).append('\'');
         if (options.comment != null)
-            and(sb, formatted).append("comment = '").append(options.comment).append('\'');
+            and(sb, formatted).append("comment = '").append(options.comment.replace("'","''")).append('\'');
         and(sb, formatted).append("compaction = ").append(formatOptionMap(options.compaction));
         and(sb, formatted).append("compression = ").append(formatOptionMap(options.compression));
         if (cassandraVersion.getMajor() >= 2) {
diff --git a/driver-core/src/test/java/com/datastax/driver/core/TableMetadataTest.java b/driver-core/src/test/java/com/datastax/driver/core/TableMetadataTest.java
@@ -0,0 +1,25 @@
+package com.datastax.driver.core;
+
+import java.util.Collection;
+
+import com.google.common.collect.Lists;
+import org.testng.annotations.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TableMetadataTest extends CCMBridge.PerClassSingleNodeCluster {
+    @Override
+    protected Collection<String> getTableDefinitions() {
+        return Lists.newArrayList(
+            "CREATE TABLE single_quote (\n"
+                + "    c1 int PRIMARY KEY\n"
+                + ") WITH  comment = 'comment with single quote '' should work'"
+        );
+    }
+
+    @Test(groups = "short")
+    public void should_escape_single_quote_table_comment() {
+        TableMetadata table = cluster.getMetadata().getKeyspace("ks").getTable("single_quote");
+        assertThat(table.asCQLQuery()).contains("comment with single quote '' should work");
+    }
+}
