cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject git commit: ninja very slightly tweak cqlsh completion
Date Wed, 28 Nov 2012 10:56:35 GMT
Updated Branches:
  refs/heads/cassandra-1.2.0 5a3eb1a6c -> 25d95377d


ninja very slightly tweak cqlsh completion


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

Branch: refs/heads/cassandra-1.2.0
Commit: 25d95377dba23b7918d2c6902a89ed063e30b503
Parents: 5a3eb1a
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Wed Nov 28 13:55:55 2012 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Wed Nov 28 13:55:55 2012 +0300

----------------------------------------------------------------------
 pylib/cqlshlib/cql3handling.py |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/25d95377/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/cql3handling.py b/pylib/cqlshlib/cql3handling.py
index 1ef9dcb..254e62a 100644
--- a/pylib/cqlshlib/cql3handling.py
+++ b/pylib/cqlshlib/cql3handling.py
@@ -251,9 +251,7 @@ JUNK ::= /([ \t\r\f\v]+|(--|[/][/])[^\n\r]*([\n\r]|$)|[/][*].*?[*][/])/
;
                   | <selectStatement>
                   | <dataChangeStatement>
                   | <schemaChangeStatement>
-                  | <grantStatement>
-                  | <revokeStatement>
-                  | <listGrantsStatement>
+                  | <authorizationStatement>
                   ;
 
 <dataChangeStatement> ::= <insertStatement>
@@ -273,6 +271,11 @@ JUNK ::= /([ \t\r\f\v]+|(--|[/][/])[^\n\r]*([\n\r]|$)|[/][*].*?[*][/])/
;
                           | <alterKeyspaceStatement>
                           ;
 
+<authorizationStatement> ::= | <grantStatement>
+                             | <revokeStatement>
+                             | <listPermissionsStatement>
+                             ;
+
 # timestamp is included here, since it's also a keyword
 <simpleStorageType> ::= typename=( <identifier> | <stringLiteral> | <K_TIMESTAMP>
) ;
 
@@ -1237,9 +1240,9 @@ syntax_rules += r'''
 <revokeStatement> ::= "REVOKE" <permissionExpr> "ON" <resource> "FROM"
<username>
                     ;
 
-<listGrantsStatement> ::= "LIST" <permissionExpr>
-                              ( "ON" <resource> )? ( "OF" <username> )? "NORECURSIVE"?
-                        ;
+<listPermissionsStatement> ::= "LIST" <permissionExpr>
+                                    ( "ON" <resource> )? ( "OF" <username> )?
"NORECURSIVE"?
+                             ;
 
 <permission> ::= "AUTHORIZE"
                | "CREATE"


Mime
View raw message