Make identifier and value grammar for CQL3 stricter patch by slebresne; reviewed by jbellis for CASSANDRA-4184
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/60aa1d03 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/60aa1d03 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/60aa1d03 Branch: refs/heads/trunk Commit: 60aa1d03e424af03537e50d41a6b5dccd03db0b5 Parents: 698a2bb Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Fri Apr 27 15:28:01 2012 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Fri Apr 27 15:28:01 2012 +0200 ---------------------------------------------------------------------- src/java/org/apache/cassandra/cql3/Cql.g | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/60aa1d03/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 f1b4718..9051d61 100644 --- a/src/java/org/apache/cassandra/cql3/Cql.g +++ b/src/java/org/apache/cassandra/cql3/Cql.g @@ -410,8 +410,8 @@ truncateStatement returns [TruncateStatement stmt] // Column Identifiers cident returns [ColumnIdentifier id] - : t=( IDENT | UUID | INTEGER ) { $id = new ColumnIdentifier($t.text, false); } - | t=QUOTED_NAME { $id = new ColumnIdentifier($t.text, true); } + : t=IDENT { $id = new ColumnIdentifier($t.text, false); } + | t=QUOTED_NAME { $id = new ColumnIdentifier($t.text, true); } ; // Keyspace & Column family names @@ -437,8 +437,8 @@ cidentList returns [List<ColumnIdentifier> items] // Values (includes prepared statement markers) term returns [Term term] - : t=(STRING_LITERAL | UUID | IDENT | INTEGER | FLOAT ) { $term = new Term($t.text, $t.type); } - | t=QMARK { $term = new Term($t.text, $t.type, ++currentBindMarkerIdx); } + : t=(STRING_LITERAL | UUID | INTEGER | FLOAT ) { $term = new Term($t.text, $t.type); } + | t=QMARK { $term = new Term($t.text, $t.type, ++currentBindMarkerIdx); } ; intTerm returns [Term integer]
