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:26:05 UTC

git commit: Fix QueryCompilerTest

Repository: phoenix
Updated Branches:
  refs/heads/3.0 bdae7a888 -> 93daa861d


Fix QueryCompilerTest


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

Branch: refs/heads/3.0
Commit: 93daa861d9dbe68e5565c90e13f92cbb17a7e8a0
Parents: bdae7a8
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:30:40 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/93daa861/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();
         }