You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ty...@apache.org on 2014/07/25 00:59:43 UTC
[1/2] git commit: Add cqlsh completion for IF [NOT] EXISTS in
CREATE/DROP USER
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1.0 72676dd48 -> 17b26a2ae
Add cqlsh completion for IF [NOT] EXISTS in CREATE/DROP USER
Patch by Michał Michalski; review by Tyler Hobbs for CASSANDRA-7611
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/59c7e250
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/59c7e250
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/59c7e250
Branch: refs/heads/cassandra-2.1.0
Commit: 59c7e2506894d7ff7f94768116890a636cfc35b6
Parents: 67ce78f
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Thu Jul 24 17:56:29 2014 -0500
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Thu Jul 24 17:56:29 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/cql3handling.py | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/59c7e250/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 7819ccb..aeb4b9d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.10
+ * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611)
* Always merge ranges owned by a single node (CASSANDRA-6930)
* Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
* Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/59c7e250/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/cql3handling.py b/pylib/cqlshlib/cql3handling.py
index b2557fe..01818ca 100644
--- a/pylib/cqlshlib/cql3handling.py
+++ b/pylib/cqlshlib/cql3handling.py
@@ -1002,7 +1002,7 @@ syntax_rules += r'''
<username> ::= name=( <identifier> | <stringLiteral> )
;
-<createUserStatement> ::= "CREATE" "USER" <username>
+<createUserStatement> ::= "CREATE" "USER" ( "IF" "NOT" "EXISTS" )? <username>
( "WITH" "PASSWORD" <stringLiteral> )?
( "SUPERUSER" | "NOSUPERUSER" )?
;
@@ -1012,7 +1012,7 @@ syntax_rules += r'''
( "SUPERUSER" | "NOSUPERUSER" )?
;
-<dropUserStatement> ::= "DROP" "USER" <username>
+<dropUserStatement> ::= "DROP" "USER" ( "IF" "EXISTS" )? <username>
;
<listUsersStatement> ::= "LIST" "USERS"
[2/2] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Posted by ty...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/17b26a2a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/17b26a2a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/17b26a2a
Branch: refs/heads/cassandra-2.1.0
Commit: 17b26a2ae783dab18a7947f6eaf1b7e91dec94ab
Parents: 72676dd 59c7e25
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Thu Jul 24 17:59:23 2014 -0500
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Thu Jul 24 17:59:23 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------