cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [1/5] cassandra git commit: cqlsh: Fix NULL option in COPY cmds after CASS-10415
Date Tue, 27 Oct 2015 14:12:54 GMT
Repository: cassandra
Updated Branches:
  refs/heads/trunk d3617a347 -> 7cedeca9a


cqlsh: Fix NULL option in COPY cmds after CASS-10415

Patch by Stefania Alborghetti; reviewed by Tyler Hobbs for
CASSANDRA-10577


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

Branch: refs/heads/trunk
Commit: 78810f25506b3b612f22fb20ddc7500e45cb1eec
Parents: 87f43ac
Author: Stefania Alborghetti <stefania.alborghetti@datastax.com>
Authored: Tue Oct 27 09:10:10 2015 -0500
Committer: Tyler Hobbs <tylerlhobbs@gmail.com>
Committed: Tue Oct 27 09:10:10 2015 -0500

----------------------------------------------------------------------
 bin/cqlsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/78810f25/bin/cqlsh
----------------------------------------------------------------------
diff --git a/bin/cqlsh b/bin/cqlsh
index 21f8ffe..ca45be3 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -327,10 +327,11 @@ cqlsh_extra_syntax_rules = r'''
                          ( "WITH" <copyOption> ( "AND" <copyOption> )* )?
                 ;
 
-<copyOption> ::= [optnames]=<identifier> "=" [optvals]=<copyOptionVal>
+<copyOption> ::= [optnames]=(<identifier>|<reserved_identifier>) "=" [optvals]=<copyOptionVal>
                ;
 
 <copyOptionVal> ::= <identifier>
+                  | <reserved_identifier>
                   | <stringLiteral>
                   ;
 


Mime
View raw message