[arrow-datafusion] 02/02: Fix logical merge conflict

[al...@apache.org]

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

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

commit 508f1858b75bbfb01295fc0fd7b846517e84646a
Author: Andrew Lamb <an...@nerdnetworks.org>
AuthorDate: Sun Jun 11 18:07:51 2023 -0400

    Fix logical merge conflict
---
 datafusion/core/tests/sql/udf.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/datafusion/core/tests/sql/udf.rs b/datafusion/core/tests/sql/udf.rs
index eb76c34175..0ecd5d0fde 100644
--- a/datafusion/core/tests/sql/udf.rs
+++ b/datafusion/core/tests/sql/udf.rs
@@ -185,7 +185,7 @@ async fn scalar_udf_override_built_in_scalar_function() -> Result<()> {
 
     let batch = RecordBatch::try_new(
         Arc::new(schema.clone()),
-        vec![Arc::new(Int32Array::from_slice([-100]))],
+        vec![Arc::new(Int32Array::from(vec![-100]))],
     )?;
     let ctx = SessionContext::new();