Skip to content

Commit e1699eb

Browse files
bschoeningbschoening
committed
Update and syncronize cql_singlefile.adoc with CQL.textile updates
patch by Brad Schoening; reviewed by Jyothsna Konisa for CASSANDRA-20405
2 parents 9c8ab88 + 756af29 commit e1699eb

File tree

11 files changed

+105
-877
lines changed

11 files changed

+105
-877
lines changed

‎doc/modules/cassandra/examples/BNF/alter_role_statement.bnf‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,12 @@
1-
alter_role_statement ::= ALTER ROLE [ IF EXISTS ] role_name WITH role_options
1+
alter_role_statement ::= ALTER ROLE [ IF EXISTS ] role_name ( WITH <option> ( AND <option> )* )?
2+
3+
<option> ::= PASSWORD = <string>
4+
| HASHED PASSWORD = <string>
5+
| GENERATED PASSWORD
6+
| LOGIN = <boolean>
7+
| SUPERUSER = <boolean>
8+
| OPTIONS = <map_literal>
9+
| ACCESS TO DATACENTERS <set_literal>
10+
| ACCESS TO ALL DATACENTERS
11+
| ACCESS FROM CIDRS <set_literal>
12+
| ACCESS FROM ALL CIDRS

‎doc/modules/cassandra/examples/BNF/alter_user_statement.bnf‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,7 @@
1-
alter_user_statement ::= ALTER USER [ IF EXISTS ] role_name [ WITH [ HASHED ] PASSWORD string] [ user_option]
1+
alter_user_statement ::= ALTER USER [ IF EXISTS ] role_name ( WITH <option> ( AND <option> )* )?
2+
3+
<option> ::= PASSWORD = <string>
4+
| HASHED PASSWORD = <string>
5+
| GENERATED PASSWORD
6+
| SUPERUSER
7+
| NOSUPERUSER

‎doc/modules/cassandra/examples/BNF/create_role_statement.bnf‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
create_role_statement ::= CREATE ROLE [ IF NOT EXISTS ] role_name
22
[ WITH role_options# ]
33
role_options ::= role_option ( AND role_option)*
4-
role_option ::= PASSWORD '=' string
5-
| HASHED PASSWORD '=' string
6-
| LOGIN '=' boolean
7-
| SUPERUSER '=' boolean
8-
| OPTIONS '=' map_literal
9-
| ACCESS TO DATACENTERS set_literal
4+
role_option ::= PASSWORD = <string>
5+
| HASHED PASSWORD = <string>
6+
| GENERATED PASSWORD
7+
| LOGIN = <boolean>
8+
| SUPERUSER = <boolean>
9+
| OPTIONS = <map_literal>
10+
| ACCESS TO DATACENTERS <set_literal>
1011
| ACCESS TO ALL DATACENTERS
11-
| ACCESS FROM CIDRS set_literal
12+
| ACCESS FROM CIDRS <set_literal>
1213
| ACCESS FROM ALL CIDRS

‎doc/modules/cassandra/examples/BNF/create_user_statement.bnf‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
create_user_statement ::= CREATE USER [ IF NOT EXISTS ] role_name
2-
[ WITH [ HASHED ] PASSWORD string ]
3-
[ user_option ]
4-
user_option: SUPERUSER | NOSUPERUSER
1+
create_user_statement ::= CREATE USER [ IF NOT EXISTS ] role_name ( WITH <option> ( AND <option> )* )?
2+
<option> ::= PASSWORD = <string>
3+
| HASHED PASSWORD = <string>
4+
| GENERATED PASSWORD
5+
| SUPERUSER
6+
| NOSUPERUSER

‎doc/modules/cassandra/examples/CQL/alter_role.cql‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
ALTER ROLE bob WITH PASSWORD = 'PASSWORD_B' AND SUPERUSER = false;
22
ALTER ROLE bob WITH HASHED PASSWORD = '$2a$10$JSJEMFm6GeaW9XxT5JIheuEtPvat6i7uKbnTcxX3c1wshIIsGyUtG' AND SUPERUSER = false;
3-
ALTER ROLE rob WITH LOGIN = true and PASSWORD = 'password_c' AND ACCESS FROM ALL CIDRS;
4-
ALTER ROLE hob WITH LOGIN = true and PASSWORD = 'password_d' AND ACCESS FROM CIDRS { 'region1' };
3+
ALTER ROLE rob WITH LOGIN = true AND PASSWORD = 'password_c' AND ACCESS FROM ALL CIDRS;
4+
ALTER ROLE IF EXISTS hob WITH LOGIN = true AND PASSWORD = 'password_d' AND ACCESS FROM CIDRS { 'region1' };
5+
ALTER ROLE IF EXISTS hob WITH LOGIN = true AND GENERATED PASSWORD;

‎doc/modules/cassandra/examples/CQL/create_role.cql‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@ CREATE ROLE bob WITH PASSWORD = 'password_b' AND LOGIN = true AND SUPERUSER = tr
55
CREATE ROLE carlos WITH OPTIONS = { 'custom_option1' : 'option1_value', 'custom_option2' : 99 };
66
CREATE ROLE alice WITH PASSWORD = 'password_a' AND LOGIN = true AND ACCESS TO DATACENTERS {'DC1', 'DC3'};
77
CREATE ROLE alice WITH PASSWORD = 'password_a' AND LOGIN = true AND ACCESS TO ALL DATACENTERS;
8-
CREATE ROLE bob WITH LOGIN = true and PASSWORD = 'password_d' AND ACCESS FROM CIDRS { 'region1', 'region2' };
9-
CREATE ROLE hob WITH LOGIN = true and PASSWORD = 'password_c' AND ACCESS FROM ALL CIDRS;
8+
CREATE ROLE bob WITH LOGIN = true AND PASSWORD = 'password_d' AND ACCESS FROM CIDRS { 'region1', 'region2' };
9+
CREATE ROLE hob WITH LOGIN = true AND PASSWORD = 'password_c' AND ACCESS FROM ALL CIDRS;
10+
CREATE ROLE tom WITH LOGIN = true AND GENERATED PASSWORD;

‎doc/modules/cassandra/examples/CQL/create_user.cql‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
CREATE USER alice WITH PASSWORD 'password_a' SUPERUSER;
22
CREATE USER bob WITH PASSWORD 'password_b' NOSUPERUSER;
33
CREATE USER bob WITH HASHED PASSWORD '$2a$10$JSJEMFm6GeaW9XxT5JIheuEtPvat6i7uKbnTcxX3c1wshIIsGyUtG' NOSUPERUSER;
4+
CREATE USER tom WITH GENERATED PASSWORD;

‎doc/modules/cassandra/examples/CQL/create_user_role.cql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ CREATE ROLE alice WITH PASSWORD = 'password_a' AND LOGIN = true;
1313
CREATE USER alice WITH PASSWORD 'password_a';
1414
CREATE ROLE alice WITH PASSWORD = 'password_a' AND LOGIN = true;
1515

16-
CREATE ROLE rob WITH LOGIN = true and PASSWORD = 'password_c' AND ACCESS FROM ALL CIDRS;
17-
CREATE ROLE hob WITH LOGIN = true and PASSWORD = 'password_d' AND ACCESS FROM CIDRS { 'region1' };
16+
CREATE ROLE rob WITH LOGIN = true AND PASSWORD = 'password_c' AND ACCESS FROM ALL CIDRS;
17+
CREATE ROLE hob WITH LOGIN = true AND PASSWORD = 'password_d' AND ACCESS FROM CIDRS { 'region1' };

‎doc/modules/cassandra/examples/CQL/select_range.cql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SELECT * FROM t2 WHERE a = 0 AND b > 0 and b <= 3;
1+
SELECT * FROM t2 WHERE a = 0 AND b > 0 AND b <= 3;

0 commit comments

Comments
 (0)