Repository: cassandra Updated Branches: refs/heads/trunk 9fdbb6559 -> ee5e48795
Make = optional in CREATE/ALTER ROLE statements Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ee5e4879 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ee5e4879 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ee5e4879 Branch: refs/heads/trunk Commit: ee5e48795583f525dca50d3535167f26cc0bc8ca Parents: 9fdbb65 Author: Sam Tunnicliffe <s...@beobal.com> Authored: Fri Feb 6 19:06:03 2015 +0000 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Fri Feb 20 14:43:54 2015 -0800 ---------------------------------------------------------------------- CHANGES.txt | 2 +- pylib/cqlshlib/cql3handling.py | 4 ++-- src/java/org/apache/cassandra/cql3/Cql.g | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ee5e4879/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 07f3448..6a3d059 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,5 +1,5 @@ 3.0 - * Add role based access control (CASSANDRA-7653, 8650, 7216) + * Add role based access control (CASSANDRA-7653, 8650, 7216, 8760) * Avoid accessing partitioner through StorageProxy (CASSANDRA-8244, 8268) * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657) * Serializing Row cache alternative, fully off heap (CASSANDRA-7438) http://git-wip-us.apache.org/repos/asf/cassandra/blob/ee5e4879/pylib/cqlshlib/cql3handling.py ---------------------------------------------------------------------- diff --git a/pylib/cqlshlib/cql3handling.py b/pylib/cqlshlib/cql3handling.py index 9c4e633..6837439 100644 --- a/pylib/cqlshlib/cql3handling.py +++ b/pylib/cqlshlib/cql3handling.py @@ -1191,8 +1191,8 @@ syntax_rules += r''' ( "SUPERUSER" | "NOSUPERUSER" )? ( "LOGIN" | "NOLOGIN" )? ; -<roleProperty> ::= "PASSWORD" <stringLiteral> - | "OPTIONS" <mapLiteral> +<roleProperty> ::= "PASSWORD" "="? <stringLiteral> + | "OPTIONS" "="? <mapLiteral> ; <dropRoleStatement> ::= "DROP" "ROLE" <rolename> http://git-wip-us.apache.org/repos/asf/cassandra/blob/ee5e4879/src/java/org/apache/cassandra/cql3/Cql.g ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/Cql.g b/src/java/org/apache/cassandra/cql3/Cql.g index 5d5c868..d941bc6 100644 --- a/src/java/org/apache/cassandra/cql3/Cql.g +++ b/src/java/org/apache/cassandra/cql3/Cql.g @@ -1023,8 +1023,8 @@ roleOptions[RoleOptions opts] ; roleOption[RoleOptions opts] - : k=K_PASSWORD v=STRING_LITERAL { opts.put($k.text, $v.text); } - | k=K_OPTIONS m=mapLiteral { opts.put(IRoleManager.Option.OPTIONS.name(), convertPropertyMap(m)); } + : k=K_PASSWORD '='? v=STRING_LITERAL { opts.put($k.text, $v.text); } + | k=K_OPTIONS '='? m=mapLiteral { opts.put(IRoleManager.Option.OPTIONS.name(), convertPropertyMap(m)); } ; /** DEFINITIONS **/
