fixup! fixup! always use source lookup in genericFunctionQuery

crate · Oct 30, 2014 · cffe863 · cffe863
1 parent 9d6aef9
commit cffe863
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/sql/src/main/java/io/crate/operation/operator/CmpOperator.java b/sql/src/main/java/io/crate/operation/operator/CmpOperator.java
@@ -69,11 +69,8 @@ public Boolean evaluate(Input<Object>... args) {
         if (left == null || right == null) {
             return null;
         }
-        try {
-            assert (left.getClass().equals(right.getClass()));
-        } catch (AssertionError e) {
-            e.printStackTrace();
-        }
+
+        assert (left.getClass().equals(right.getClass())) : "left and right must have the same type for comparison";
 
         if (left instanceof Comparable) {
             return compare(((Comparable)left).compareTo(right));

diff --git a/sql/src/test/java/io/crate/integrationtests/RegexpIntegrationTest.java b/sql/src/test/java/io/crate/integrationtests/RegexpIntegrationTest.java
@@ -53,8 +53,8 @@ public void testRegexpMatchesIsNull() throws Exception {
         refresh();
         execute("select i from regex_test where regexp_matches(s, 'is') is not null");
         assertThat(response.rowCount(), is(4L));
-        //execute("select i from regex_test where regexp_matches(s, 'is') is null");
-        //assertThat(response.rowCount(), is(2L));
+        execute("select i from regex_test where regexp_matches(s, 'is') is null");
+        assertThat(response.rowCount(), is(2L));
     }
 
     @Test

diff --git a/sql/src/test/java/io/crate/integrationtests/TransportSQLActionTest.java b/sql/src/test/java/io/crate/integrationtests/TransportSQLActionTest.java
@@ -2925,7 +2925,7 @@ public void testWhereColumnEqColumnAndFunctionEqFunction() throws Exception {
     }
 
     @Test
-    public void testWhereFunctionWithAnalazyedColumnArgument() throws Exception {
+    public void testWhereFunctionWithAnalyzedColumnArgument() throws Exception {
         execute("create table t (text string index using fulltext) " +
                 "clustered into 1 shards with (number_of_replicas = 0)");
         ensureGreen();