svn commit: r1171792 - in /cassandra/branches/cassandra-0.8: CHANGES.txt src/java/org/apache/cassandra/cli/CliClient.java

[xedin]

Author: xedin
Date: Fri Sep 16 21:22:02 2011
New Revision: 1171792

URL: http://svn.apache.org/viewvc?rev=1171792&view=rev
Log:
Allow using quotes in "USE <keyspace>;" CLI command
patch by Pavel Yaskevich; reviewed by Jonathan Ellis for CASSANDRA-3208

Modified:
    cassandra/branches/cassandra-0.8/CHANGES.txt
    
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cli/CliClient.java

Modified: cassandra/branches/cassandra-0.8/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/CHANGES.txt?rev=1171792&r1=1171791&r2=1171792&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8/CHANGES.txt Fri Sep 16 21:22:02 2011
@@ -1,6 +1,6 @@
 0.8.7
  * Kill server on wrapped OOME such as from FileChannel.map (CASSANDRA-3201)
-
+ * Allow using quotes in "USE <keyspace>;" CLI command (CASSANDRA-3208)
 
 0.8.6
  * revert CASSANDRA-2388

Modified: 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cli/CliClient.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cli/CliClient.java?rev=1171792&r1=1171791&r2=1171792&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cli/CliClient.java
 (original)
+++ 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cli/CliClient.java
 Fri Sep 16 21:22:02 2011
@@ -1795,9 +1795,10 @@ public class CliClient
         String keySpaceName, username = null, password = null;
 
         // Get keyspace name
-        keySpaceName = statement.getChild(0).getText();
-        
-        if (childCount == 3) {
+        keySpaceName = 
CliUtils.unescapeSQLString(statement.getChild(0).getText());
+
+        if (childCount == 3)
+        {
             username  = statement.getChild(1).getText();
             password  = statement.getChild(2).getText();
         }