You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by xe...@apache.org on 2012/04/06 22:38:46 UTC
[5/6] git commit: cqlsh cql3 syntax support for double-quoted names
cqlsh cql3 syntax support for double-quoted names
i.e., at least don't throw an error on seeing "" in cql text
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ab536050
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ab536050
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ab536050
Branch: refs/heads/trunk
Commit: ab536050df60ff41de9ab91448c69c2350402d4f
Parents: f119da0
Author: paul cannon <pa...@datastax.com>
Authored: Tue Apr 3 13:56:14 2012 -0500
Committer: Eric Evans <ee...@apache.org>
Committed: Fri Apr 6 11:03:49 2012 -0500
----------------------------------------------------------------------
pylib/cqlshlib/cqlhandling.py | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ab536050/pylib/cqlshlib/cqlhandling.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/cqlhandling.py b/pylib/cqlshlib/cqlhandling.py
index d494a91..3907162 100644
--- a/pylib/cqlshlib/cqlhandling.py
+++ b/pylib/cqlshlib/cqlhandling.py
@@ -209,6 +209,7 @@ syntax_rules = r'''
JUNK ::= /([ \t\r\f\v]+|(--|[/][/])[^\n\r]*([\n\r]|$)|[/][*].*?[*][/])/ ;
<stringLiteral> ::= /'([^']|'')*'/ ;
+<dquoteLiteral> ::= /"([^"]|"")*"/ ;
<float> ::= /-?[0-9]+\.[0-9]+/ ;
<integer> ::= /-?[0-9]+/ ;
<uuid> ::= /[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/ ;
@@ -230,6 +231,7 @@ JUNK ::= /([ \t\r\f\v]+|(--|[/][/])[^\n\r]*([\n\r]|$)|[/][*].*?[*][/])/ ;
;
<name> ::= <identifier>
| <stringLiteral>
+ | <dquoteLiteral>
| <integer>
;
<term> ::= <stringLiteral>