Repository: cassandra Updated Branches: refs/heads/cassandra-3.0 f5416e38b -> 025384c06
alter/drop user should be case sensitive Patch by marcuse; reviewed by Sam Tunnicliffe for CASSANDRA-10817 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f8452838 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f8452838 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f8452838 Branch: refs/heads/cassandra-3.0 Commit: f8452838a964c7bfa938277c9fdfc337f9aff886 Parents: 0967825 Author: Marcus Eriksson <marc...@apache.org> Authored: Mon Dec 14 15:33:21 2015 +0100 Committer: Marcus Eriksson <marc...@apache.org> Committed: Tue Jan 5 10:32:44 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/Cql.g | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f8452838/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index b700102..bb5909c 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.2.5 + * drop/alter user should be case sensitive (CASSANDRA-10817) * jemalloc detection fails due to quoting issues in regexv (CASSANDRA-10946) * Support counter-columns for native aggregates (sum,avg,max,min) (CASSANDRA-9977) * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813) http://git-wip-us.apache.org/repos/asf/cassandra/blob/f8452838/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 b4cbac8..035e704 100644 --- a/src/java/org/apache/cassandra/cql3/Cql.g +++ b/src/java/org/apache/cassandra/cql3/Cql.g @@ -982,7 +982,7 @@ alterUserStatement returns [AlterRoleStatement stmt] RoleOptions opts = new RoleOptions(); RoleName name = new RoleName(); } - : K_ALTER K_USER u=username { name.setName($u.text, false); } + : K_ALTER K_USER u=username { name.setName($u.text, true); } ( K_WITH userPassword[opts] )? ( K_SUPERUSER { opts.setOption(IRoleManager.Option.SUPERUSER, true); } | K_NOSUPERUSER { opts.setOption(IRoleManager.Option.SUPERUSER, false); } ) ? @@ -997,7 +997,7 @@ dropUserStatement returns [DropRoleStatement stmt] boolean ifExists = false; RoleName name = new RoleName(); } - : K_DROP K_USER (K_IF K_EXISTS { ifExists = true; })? u=username { name.setName($u.text, false); $stmt = new DropRoleStatement(name, ifExists); } + : K_DROP K_USER (K_IF K_EXISTS { ifExists = true; })? u=username { name.setName($u.text, true); $stmt = new DropRoleStatement(name, ifExists); } ; /**