cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eev...@apache.org
Subject [2/3] git commit: cqlsh cql3 syntax support for double-quoted names
Date Fri, 06 Apr 2012 15:39:35 GMT
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/875b492f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/875b492f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/875b492f

Branch: refs/heads/cassandra-1.1
Commit: 875b492f6b67d7c9e7a7069289545437e82a26b9
Parents: b2de5f1
Author: paul cannon <paul@datastax.com>
Authored: Tue Apr 3 13:56:14 2012 -0500
Committer: Eric Evans <eevans@apache.org>
Committed: Fri Apr 6 10:37:09 2012 -0500

----------------------------------------------------------------------
 pylib/cqlshlib/cqlhandling.py |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/875b492f/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>


Mime
View raw message