fix test

Author: houqp

convergence-arrow/examples/datafusion.rs

@@ -2,8 +2,9 @@ use convergence::server::{self, BindOptions};
 use convergence_arrow::datafusion::DataFusionEngine;
 use convergence_arrow::metadata::Catalog;
 use datafusion::arrow::datatypes::DataType;
-use datafusion::catalog::schema::MemorySchemaProvider;
-use datafusion::catalog::{CatalogProvider, MemoryCatalogProvider};
+use datafusion::catalog_common::memory::MemorySchemaProvider;
+use datafusion::catalog::CatalogProvider;
+use datafusion::catalog_common::MemoryCatalogProvider;
 use datafusion::logical_expr::Volatility;
 use datafusion::physical_plan::ColumnarValue;
 use datafusion::prelude::*;
@@ -35,15 +36,15 @@ async fn new_engine() -> DataFusionEngine {
 	ctx.register_udf(create_udf(
 		"pg_backend_pid",
 		vec![],
-		Arc::new(DataType::Int32),
+		DataType::Int32,
 		Volatility::Stable,
 		Arc::new(|_| Ok(ColumnarValue::Scalar(ScalarValue::Int32(Some(0))))),
 	));
 
 	ctx.register_udf(create_udf(
 		"current_schema",
 		vec![],
-		Arc::new(DataType::Utf8),
+		DataType::Utf8,
 		Volatility::Stable,
 		Arc::new(|_| Ok(ColumnarValue::Scalar(ScalarValue::Utf8(Some("public".to_owned()))))),
 	));

convergence/tests/test_connection.rs

@@ -79,16 +79,16 @@ async fn extended_query_flow() {
 async fn simple_query_flow() {
 	let client = setup().await;
 	let messages = client.simple_query("select 1").await.unwrap();
-	assert_eq!(messages.len(), 2);
+	assert_eq!(messages.len(), 3);
 
-	let row = match &messages[0] {
+	let row = match &messages[1] {
 		SimpleQueryMessage::Row(row) => row,
 		_ => panic!("expected row"),
 	};
 
 	assert_eq!(row.get(0), Some("1"));
 
-	let num_rows = match &messages[1] {
+	let num_rows = match &messages[2] {
 		SimpleQueryMessage::CommandComplete(rows) => *rows,
 		_ => panic!("expected command complete"),
 	};