[arrow-datafusion] branch master updated: Fix test output due to logical merge conflict (#694)

[alamb]

This is an automated email from the ASF dual-hosted git repository.

alamb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow-datafusion.git


The following commit(s) were added to refs/heads/master by this push:
     new bbc9c6c  Fix test output due to logical merge conflict (#694)
bbc9c6c is described below

commit bbc9c6c68a03a19e4f385663b7c7ab795748f16e
Author: Andrew Lamb <and...@nerdnetworks.org>
AuthorDate: Wed Jul 7 09:00:32 2021 -0400

    Fix test output due to logical merge conflict (#694)
---
 datafusion/tests/sql.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/datafusion/tests/sql.rs b/datafusion/tests/sql.rs
index f6f8b6f..9c7d079 100644
--- a/datafusion/tests/sql.rs
+++ b/datafusion/tests/sql.rs
@@ -1705,7 +1705,7 @@ async fn equijoin_and_unsupported_condition() -> 
Result<()> {
         "SELECT t1_id, t1_name, t2_name FROM t1 LEFT JOIN t2 ON t1_id = t2_id 
AND t2_name >= 'y' ORDER BY t1_id";
     let res = ctx.create_logical_plan(sql);
     assert!(res.is_err());
-    assert_eq!(format!("{}", res.unwrap_err()), "This feature is not 
implemented: Unsupported expressions in Left JOIN: [#t2.t2_name GtEq 
Utf8(\"y\")]");
+    assert_eq!(format!("{}", res.unwrap_err()), "This feature is not 
implemented: Unsupported expressions in Left JOIN: [#t2_name GtEq 
Utf8(\"y\")]");
     Ok(())
 }