(CLI) properly handle quotes in create/update keyspace commands

patch by Pavel Yaskevich; reviewed by Jonathan Ellis (CASSANDRA-4129)
apache · Apr 6, 2012 · 17d6354 · 17d6354
1 parent 40515ed
commit 17d6354
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,5 +1,6 @@
 1.0.10
  * cqlsh: guess correct version of Python for Arch Linux (CASSANDRA-4090)
+ * (CLI) properly handle quotes in create/update keyspace commands (CASSANDRA-4129)
 
 
 1.0.9

diff --git a/src/java/org/apache/cassandra/cli/CliClient.java b/src/java/org/apache/cassandra/cli/CliClient.java
@@ -991,7 +991,7 @@ private void executeAddKeySpace(Tree statement)
             return;
 
         // first value is the keyspace name, after that it is all key=value
-        String keyspaceName = statement.getChild(0).getText();
+        String keyspaceName = CliUtils.unescapeSQLString(statement.getChild(0).getText());
         KsDef ksDef = new KsDef(keyspaceName, DEFAULT_PLACEMENT_STRATEGY, new LinkedList<CfDef>());
 
         try

diff --git a/src/java/org/apache/cassandra/cli/CliCompiler.java b/src/java/org/apache/cassandra/cli/CliCompiler.java
@@ -125,7 +125,7 @@ else if (cfDef.name.toUpperCase().equals(cfName.toUpperCase()))
 
     public static String getKeySpace(Tree statement, List<KsDef> keyspaces)
     {
-        return getKeySpace(statement.getChild(0).getText(), keyspaces);
+        return getKeySpace(CliUtils.unescapeSQLString(statement.getChild(0).getText()), keyspaces);
     }
 
     public static String getKeySpace(String ksName, List<KsDef> keyspaces)