svn commit: r1080284 - in /cassandra/trunk/src/java/org/apache/cassandra/cql: Cql.g Term.java

[eevans]

Author: eevans
Date: Thu Mar 10 17:11:29 2011
New Revision: 1080284

URL: http://svn.apache.org/viewvc?rev=1080284&view=rev
Log:
allow IDENT token as relaxed form of string literal

Patch by eevans for CASSANDRA-2027

Modified:
    cassandra/trunk/src/java/org/apache/cassandra/cql/Cql.g
    cassandra/trunk/src/java/org/apache/cassandra/cql/Term.java

Modified: cassandra/trunk/src/java/org/apache/cassandra/cql/Cql.g
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cql/Cql.g?rev=1080284&r1=1080283&r2=1080284&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/cql/Cql.g (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/cql/Cql.g Thu Mar 10 17:11:29 
2011
@@ -266,7 +266,7 @@ comparatorType
     ;
 
 term returns [Term item]
-    : ( t=STRING_LITERAL | t=INTEGER | t=UUID ) { $item = new Term($t.text, 
$t.type); }
+    : ( t=STRING_LITERAL | t=INTEGER | t=UUID | t=IDENT ) { $item = new 
Term($t.text, $t.type); }
     ;
 
 termList returns [List<Term> items]

Modified: cassandra/trunk/src/java/org/apache/cassandra/cql/Term.java
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cql/Term.java?rev=1080284&r1=1080283&r2=1080284&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/cql/Term.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/cql/Term.java Thu Mar 10 
17:11:29 2011
@@ -134,7 +134,7 @@ enum TermType
     
     static TermType forInt(int type)
     {
-        if (type == CqlParser.STRING_LITERAL)
+        if ((type == CqlParser.STRING_LITERAL) || (type == CqlParser.IDENT))
             return STRING;
         else if (type == CqlParser.INTEGER)
             return INTEGER;