Fix token awareness for case-sensitive keyspaces (JAVA-526).

olim7t · olim7t · commit 4afcf2c32457 · 2014-11-03T15:50:30.000+01:00
diff --git a/driver-core/CHANGELOG.rst b/driver-core/CHANGELOG.rst
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+2.0.8:
+------
+- [bug] Fix token awareness for case-sensitive keyspaces (JAVA-526)
+
+
 2.0.7:
 ------
 
diff --git a/driver-core/src/main/java/com/datastax/driver/core/DefaultPreparedStatement.java b/driver-core/src/main/java/com/datastax/driver/core/DefaultPreparedStatement.java
@@ -50,7 +50,7 @@ static DefaultPreparedStatement fromMessage(Responses.Result.Prepared msg, Metad
 
         List<ColumnMetadata> partitionKeyColumns = null;
         int[] pkIndexes = null;
-        KeyspaceMetadata km = clusterMetadata.getKeyspace(defs.getKeyspace(0));
+        KeyspaceMetadata km = clusterMetadata.getKeyspace(Metadata.quote(defs.getKeyspace(0)));
         if (km != null) {
             TableMetadata tm = km.getTable(defs.getTable(0));
             if (tm != null) {
diff --git a/driver-core/src/test/java/com/datastax/driver/core/PreparedStatementTest.java b/driver-core/src/test/java/com/datastax/driver/core/PreparedStatementTest.java
@@ -18,6 +18,8 @@
 import java.util.*;
 
 import org.testng.annotations.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
@@ -408,4 +410,26 @@ public void batchTest() throws Exception {
                 throw e;
         }
     }
+
+    @Test(groups="short")
+    public void should_set_routing_key_on_case_insensitive_keyspace() {
+        session.execute("CREATE TABLE ks.foo (i int PRIMARY KEY)");
+
+        PreparedStatement ps = session.prepare("INSERT INTO ks.foo (i) VALUES (?)");
+        BoundStatement bs = ps.bind(1);
+        assertThat(bs.getRoutingKey()).isNotNull();
+    }
+
+    @Test(groups="short")
+    public void should_set_routing_key_on_case_sensitive_keyspace() {
+        session.execute("CREATE KEYSPACE \"Test\" WITH replication = { "
+            + "  'class': 'SimpleStrategy',"
+            + "  'replication_factor': '1'"
+            + "}");
+        session.execute("CREATE TABLE \"Test\".foo (i int PRIMARY KEY)");
+
+        PreparedStatement ps = session.prepare("INSERT INTO \"Test\".foo (i) VALUES (?)");
+        BoundStatement bs = ps.bind(1);
+        assertThat(bs.getRoutingKey()).isNotNull();
+    }
 }
