From 0b09296f5d88f4873c2555baa3c2dcc4cec5b8d0 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@cloudius-systems.com>
Date: Tue, 28 Apr 2015 18:17:25 +0300
Subject: [PATCH] cql3: enable grammer for collection conditions

  map['key'] IN (1, 2, 3)

etc.
---
 cql3/Cql.g | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/cql3/Cql.g b/cql3/Cql.g
index 994aba7d9987..e57300832a7a 100644
--- a/cql3/Cql.g
+++ b/cql3/Cql.g
@@ -1152,15 +1152,13 @@ columnCondition[conditions_type& conditions]
             ( values=singleColumnInValues { conditions.emplace_back(key, cql3::column_condition::raw::simple_in_condition(values)); }
             | marker=inMarker { conditions.emplace_back(key, cql3::column_condition::raw::simple_in_condition(marker)); }
             )
-#if 0
         | '[' element=term ']'
-            ( op=relationType t=term { conditions.add(Pair.create(key, ColumnCondition.Raw.collectionCondition(t, element, *op))); }
+            ( op=relationType t=term { conditions.emplace_back(key, cql3::column_condition::raw::collection_condition(t, element, *op)); }
             | K_IN
-                ( values=singleColumnInValues { conditions.add(Pair.create(key, ColumnCondition.Raw.collectionInCondition(element, values))); }
-                | marker=inMarker { conditions.add(Pair.create(key, ColumnCondition.Raw.collectionInCondition(element, marker))); }
+                ( values=singleColumnInValues { conditions.emplace_back(key, cql3::column_condition::raw::collection_in_condition(element, values)); }
+                | marker=inMarker { conditions.emplace_back(key, cql3::column_condition::raw::collection_in_condition(element, marker)); }
                 )
             )
-#endif
         )
     ;