You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ja...@apache.org on 2014/10/19 06:22:45 UTC

[2/2] git commit: Fix QueryCompilerTest

Fix QueryCompilerTest


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

Branch: refs/heads/4.0
Commit: 8ba26edb48042b867f426d8dad1c93f434c1306d
Parents: 6f2816f
Author: James Taylor <jt...@salesforce.com>
Authored: Sat Oct 18 21:28:25 2014 -0700
Committer: James Taylor <jt...@salesforce.com>
Committed: Sat Oct 18 21:28:25 2014 -0700

----------------------------------------------------------------------
 .../test/java/org/apache/phoenix/compile/QueryCompilerTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/8ba26edb/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryCompilerTest.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryCompilerTest.java b/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryCompilerTest.java
index 8593246..3857736 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryCompilerTest.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryCompilerTest.java
@@ -769,7 +769,7 @@ public class QueryCompilerTest extends BaseConnectionlessQueryTest {
             statement.executeQuery();
             fail();
         } catch (SQLException e) { // expected
-            assertTrue(e.getMessage(), e.getMessage().contains("ERROR 507 (42846): Cannot convert type. COALESCE expected INTEGER, but got VARCHAR"));
+            assertTrue(e.getMessage(), e.getMessage().contains("ERROR 203 (22005): Type mismatch. COALESCE expected INTEGER, but got VARCHAR"));
         } finally {
             conn.close();
         }