Browse files

Minor CQL3 doc fixes

  • Loading branch information...
1 parent 119c726 commit 0804de9d465a7018326054ee5f26e7b5a04fe6a0 @pcmanus pcmanus committed Jan 2, 2013
Showing with 20 additions and 2 deletions.
  1. +20 −2 doc/cql3/CQL.textile
View
22 doc/cql3/CQL.textile
@@ -202,8 +202,11 @@ bc(syntax)..
<column-definition> ::= <identifier> <type> ( PRIMARY KEY )?
| PRIMARY KEY '(' <partition-key> ( ',' <identifier> )* ')'
+<partition-key> ::= <partition-key>
+ | '(' <partition-key> ( ',' <identifier> )* ')'
+
<partition-key> ::= <identifier>
- | '(' <identifier> ( ',' <identifier> )* ')'
+ | '(' <identifier> (',' <identifier> )* ')'
<option> ::= <property>
| COMPACT STORAGE
@@ -847,13 +850,14 @@ CQL distinguishes between _reserved_ and _non-reserved_ keywords. Reserved keywo
|_. Keyword |_. Reserved? |
| @ADD@ | yes |
-| @ALL@ | yes |
+| @ALL@ | no |
| @ALTER@ | yes |
| @AND@ | yes |
| @ANY@ | yes |
| @APPLY@ | yes |
| @ASC@ | yes |
| @ASCII@ | no |
+| @AUTHORIZE@ | yes |
| @BATCH@ | yes |
| @BEGIN@ | yes |
| @BIGINT@ | no |
@@ -875,6 +879,7 @@ CQL distinguishes between _reserved_ and _non-reserved_ keywords. Reserved keywo
| @EACH_QUORUM@ | yes |
| @FLOAT@ | no |
| @FROM@ | yes |
+| @GRANT@ | yes |
| @IN@ | yes |
| @INDEX@ | yes |
| @INSERT@ | yes |
@@ -885,15 +890,24 @@ CQL distinguishes between _reserved_ and _non-reserved_ keywords. Reserved keywo
| @LEVEL@ | no |
| @LIMIT@ | yes |
| @LOCAL_QUORUM@ | yes |
+| @MODIFY@ | yes |
+| @NORECURSIVE@ | yes |
+| @NOSUPERUSER@ | no |
+| @OF@ | yes |
| @ON@ | yes |
| @ONE@ | yes |
| @ORDER@ | yes |
+| @PASSWORD@ | no |
+| @PERMISSION@ | no |
+| @PERMISSIONS@ | no |
| @PRIMARY@ | yes |
| @QUORUM@ | yes |
+| @REVOKE@ | yes |
| @SCHEMA@ | yes |
| @SELECT@ | yes |
| @SET@ | yes |
| @STORAGE@ | no |
+| @SUPERUSER@ | no |
| @TABLE@ | yes |
| @TEXT@ | no |
| @TIMESTAMP@ | no |
@@ -906,6 +920,8 @@ CQL distinguishes between _reserved_ and _non-reserved_ keywords. Reserved keywo
| @TYPE@ | no |
| @UPDATE@ | yes |
| @USE@ | yes |
+| @USER@ | no |
+| @USERS@ | no |
| @USING@ | yes |
| @UUID@ | no |
| @VALUES@ | no |
@@ -916,6 +932,8 @@ CQL distinguishes between _reserved_ and _non-reserved_ keywords. Reserved keywo
| @WRITETIME@ | no |
+
+
h2. Versioning
Versioning of the CQL language adheres to the "Semantic Versioning":http://semver.org guidelines. Versions take the form X.Y.Z where X, Y, and Z are integer values representing major, minor, and patch level respectively. There is no correlation between Cassandra release versions and the CQL language version.

0 comments on commit 0804de9

Please sign in to comment.