cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [5/6] git commit: cqlsh: fix copy to/from for cql3 Patch by Aleksey Yeschenko, reviewed by brandonwilliams for CASSANDRA-4674
Date Mon, 15 Oct 2012 17:32:24 GMT
cqlsh: fix copy to/from for cql3
Patch by Aleksey Yeschenko, reviewed by brandonwilliams for
CASSANDRA-4674


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/596d54c2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/596d54c2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/596d54c2

Branch: refs/heads/trunk
Commit: 596d54c27eef4693915790320b8a5bdcf1662028
Parents: fe5e4ae
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Mon Oct 15 12:26:20 2012 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Mon Oct 15 12:26:20 2012 -0500

----------------------------------------------------------------------
 bin/cqlsh |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/596d54c2/bin/cqlsh
----------------------------------------------------------------------
diff --git a/bin/cqlsh b/bin/cqlsh
index a848d05..0a0f14c 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -234,9 +234,13 @@ cqlsh_extra_syntax_rules = r'''
                          ( "WITH" <copyOption> ( "AND" <copyOption> )* )?
                 ;
 
-<copyOption> ::= [optnames]=<cfOptionName> "=" [optvals]=<cfOptionVal>
+<copyOption> ::= [optnames]=<identifier> "=" [optvals]=<copyOptionVal>
                ;
 
+<copyOptionVal> ::= <identifier>
+                  | <stringLiteral>
+                  ;
+
 # avoiding just "DEBUG" so that this rule doesn't get treated as a terminal
 <debugCommand> ::= "DEBUG" "THINGS"?
                  ;


Mime
View raw message