Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 87f43ac51 -> 78810f255
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/cassandra-2.1 Commit: 78810f25506b3b612f22fb20ddc7500e45cb1eec Parents: 87f43ac Author: Stefania Alborghetti <stefania.alborghe...@datastax.com> Authored: Tue Oct 27 09:10:10 2015 -0500 Committer: Tyler Hobbs <tylerlho...@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> ;
