You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2012/11/28 11:56:35 UTC
git commit: ninja very slightly tweak cqlsh completion
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 <al...@apache.org>
Authored: Wed Nov 28 13:55:55 2012 +0300
Committer: Aleksey Yeschenko <al...@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"