Return-Path: 
 <commits-return-81543-apmail-cassandra-commits-archive=cassandra.apache.org@cassandra.apache.org>
X-Original-To: apmail-cassandra-commits-archive@www.apache.org
Delivered-To: apmail-cassandra-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id AF82B10D62
	for <apmail-cassandra-commits-archive@www.apache.org>;
 Fri, 20 Sep 2013 16:49:14 +0000 (UTC)
Received: (qmail 89842 invoked by uid 500); 20 Sep 2013 16:49:12 -0000
Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org
Received: (qmail 89781 invoked by uid 500); 20 Sep 2013 16:49:12 -0000
Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cassandra.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cassandra.apache.org>
List-Post: <mailto:commits@cassandra.apache.org>
List-Id: <commits.cassandra.apache.org>
Reply-To: dev@cassandra.apache.org
Delivered-To: mailing list commits@cassandra.apache.org
Received: (qmail 89740 invoked by uid 99); 20 Sep 2013 16:49:11 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Sep 2013 16:49:11 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 0FCE18AF0CE; Fri, 20 Sep 2013 16:49:11 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: aleksey@apache.org
To: commits@cassandra.apache.org
Date: Fri, 20 Sep 2013 16:49:12 -0000
Message-Id: <bf807fa5875d4b8d8cccd46c45948a2c@git.apache.org>
In-Reply-To: <5ff65273ab6149afa7c91128dde18c5c@git.apache.org>
References: <5ff65273ab6149afa7c91128dde18c5c@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [2/5] git commit: allow parenthesis around where conditions in cql
 patch by dbrosius reviewed by slebresne for cassandra-6037

allow parenthesis around where conditions in cql
patch by dbrosius reviewed by slebresne for cassandra-6037


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a0fa6971
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a0fa6971
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a0fa6971

Branch: refs/heads/trunk
Commit: a0fa69715f7913804fbd55c1280e0d35edd3bf0f
Parents: df046d6
Author: Dave Brosius <dbrosius@apache.org>
Authored: Fri Sep 20 10:47:36 2013 -0400
Committer: Dave Brosius <dbrosius@apache.org>
Committed: Fri Sep 20 10:47:36 2013 -0400

----------------------------------------------------------------------
 src/java/org/apache/cassandra/cql3/Cql.g | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0fa6971/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 2445bf2..7101c71 100644
--- a/src/java/org/apache/cassandra/cql3/Cql.g
+++ b/src/java/org/apache/cassandra/cql3/Cql.g
@@ -791,6 +791,7 @@ relation[List<Relation> clauses]
         }
     | name=cident K_IN { Relation rel = Relation.createInRelation($name.id); }
        '(' ( f1=term { rel.addInValue(f1); } (',' fN=term { rel.addInValue(fN); } )* )? ')' { $clauses.add(rel); }
+    | '(' relation[$clauses] ')'
     ;
 
 comparatorType returns [CQL3Type t]