diff --git a/crates/core-executor/src/query.rs b/crates/core-executor/src/query.rs index c0947ab55..5bb27c9f4 100644 --- a/crates/core-executor/src/query.rs +++ b/crates/core-executor/src/query.rs @@ -27,7 +27,7 @@ use core_metastore::{ TableFormat as MetastoreTableFormat, TableIdent as MetastoreTableIdent, Volume, VolumeType, models::volumes::create_object_store_from_url, }; -use datafusion::arrow::array::{Int64Array, RecordBatch}; +use datafusion::arrow::array::{Int64Array, RecordBatch, StringArray}; use datafusion::arrow::datatypes::{DataType, Field, Schema as ArrowSchema, SchemaRef}; use datafusion::arrow::datatypes::{Fields, SchemaBuilder}; use datafusion::catalog::{CatalogProvider, SchemaProvider}; @@ -2754,7 +2754,15 @@ impl UserQuery { false, )])); Ok(QueryResult::new( - vec![RecordBatch::new_empty(schema.clone())], + vec![ + RecordBatch::try_new( + schema.clone(), + vec![Arc::new(StringArray::from(vec![ + "Statement executed successfully.", + ]))], + ) + .context(ex_error::ArrowSnafu)?, + ], schema, self.query_context.query_id, )) diff --git a/crates/core-executor/src/tests/sql/commands/mod.rs b/crates/core-executor/src/tests/sql/commands/mod.rs index 5e2b49fe9..48c10720f 100644 --- a/crates/core-executor/src/tests/sql/commands/mod.rs +++ b/crates/core-executor/src/tests/sql/commands/mod.rs @@ -5,5 +5,6 @@ mod like_any; mod pivot; mod rlike_regexp; mod show; +mod status_message; mod top; mod unpivot; diff --git a/crates/core-executor/src/tests/sql/commands/snapshots/status_message/query_status_message_set.snap b/crates/core-executor/src/tests/sql/commands/snapshots/status_message/query_status_message_set.snap new file mode 100644 index 000000000..6d99e9fcd --- /dev/null +++ b/crates/core-executor/src/tests/sql/commands/snapshots/status_message/query_status_message_set.snap @@ -0,0 +1,13 @@ +--- +source: crates/core-executor/src/tests/sql/commands/status_message.rs +description: "\"SET test = 2\"" +--- +Ok( + [ + "+----------------------------------+", + "| status |", + "+----------------------------------+", + "| Statement executed successfully. |", + "+----------------------------------+", + ], +) diff --git a/crates/core-executor/src/tests/sql/commands/snapshots/status_message/query_status_message_use.snap b/crates/core-executor/src/tests/sql/commands/snapshots/status_message/query_status_message_use.snap new file mode 100644 index 000000000..05f9fdec4 --- /dev/null +++ b/crates/core-executor/src/tests/sql/commands/snapshots/status_message/query_status_message_use.snap @@ -0,0 +1,13 @@ +--- +source: crates/core-executor/src/tests/sql/commands/status_message.rs +description: "\"USE DATABASE embucket\"" +--- +Ok( + [ + "+----------------------------------+", + "| status |", + "+----------------------------------+", + "| Statement executed successfully. |", + "+----------------------------------+", + ], +) diff --git a/crates/core-executor/src/tests/sql/commands/status_message.rs b/crates/core-executor/src/tests/sql/commands/status_message.rs new file mode 100644 index 000000000..24be7423a --- /dev/null +++ b/crates/core-executor/src/tests/sql/commands/status_message.rs @@ -0,0 +1,13 @@ +use crate::test_query; + +test_query!( + status_message_use, + "USE DATABASE embucket", + snapshot_path = "status_message" +); + +test_query!( + status_message_set, + "SET test = 2", + snapshot_path = "status_message" +); diff --git a/crates/core-executor/src/tests/sql/ddl/snapshots/database/query_drop_database.snap b/crates/core-executor/src/tests/sql/ddl/snapshots/database/query_drop_database.snap index a956e9ce5..62a37ce6a 100644 --- a/crates/core-executor/src/tests/sql/ddl/snapshots/database/query_drop_database.snap +++ b/crates/core-executor/src/tests/sql/ddl/snapshots/database/query_drop_database.snap @@ -5,9 +5,10 @@ info: "Setup queries: DROP SCHEMA embucket.public" --- Ok( [ - "+--------+", - "| status |", - "+--------+", - "+--------+", + "+----------------------------------+", + "| status |", + "+----------------------------------+", + "| Statement executed successfully. |", + "+----------------------------------+", ], ) diff --git a/crates/core-executor/src/tests/sql/ddl/snapshots/table/query_alter_iceberg_table.snap b/crates/core-executor/src/tests/sql/ddl/snapshots/table/query_alter_iceberg_table.snap index 63dcd3f4b..683460511 100644 --- a/crates/core-executor/src/tests/sql/ddl/snapshots/table/query_alter_iceberg_table.snap +++ b/crates/core-executor/src/tests/sql/ddl/snapshots/table/query_alter_iceberg_table.snap @@ -5,9 +5,10 @@ info: "Setup queries: CREATE TABLE embucket.public.test (id INT) as VALUES (1), --- Ok( [ - "+--------+", - "| status |", - "+--------+", - "+--------+", + "+----------------------------------+", + "| status |", + "+----------------------------------+", + "| Statement executed successfully. |", + "+----------------------------------+", ], ) diff --git a/crates/core-executor/src/tests/sql/ddl/snapshots/table/query_alter_table.snap b/crates/core-executor/src/tests/sql/ddl/snapshots/table/query_alter_table.snap index f967fc777..af219e0d3 100644 --- a/crates/core-executor/src/tests/sql/ddl/snapshots/table/query_alter_table.snap +++ b/crates/core-executor/src/tests/sql/ddl/snapshots/table/query_alter_table.snap @@ -5,9 +5,10 @@ info: "Setup queries: CREATE TABLE embucket.public.test (id INT) as VALUES (1), --- Ok( [ - "+--------+", - "| status |", - "+--------+", - "+--------+", + "+----------------------------------+", + "| status |", + "+----------------------------------+", + "| Statement executed successfully. |", + "+----------------------------------+", ], ) diff --git a/crates/core-executor/src/tests/sql/ddl/snapshots/table/query_alter_table_if_exists_missing_table_should_pass.snap b/crates/core-executor/src/tests/sql/ddl/snapshots/table/query_alter_table_if_exists_missing_table_should_pass.snap index e2afe3577..00c84be29 100644 --- a/crates/core-executor/src/tests/sql/ddl/snapshots/table/query_alter_table_if_exists_missing_table_should_pass.snap +++ b/crates/core-executor/src/tests/sql/ddl/snapshots/table/query_alter_table_if_exists_missing_table_should_pass.snap @@ -4,9 +4,10 @@ description: "\"ALTER TABLE IF EXISTS embucket.public.missing_table add column c --- Ok( [ - "+--------+", - "| status |", - "+--------+", - "+--------+", + "+----------------------------------+", + "| status |", + "+----------------------------------+", + "| Statement executed successfully. |", + "+----------------------------------+", ], ) diff --git a/crates/core-executor/src/tests/sql/ddl/snapshots/table/query_alter_table_if_exists_stub_should_pass.snap b/crates/core-executor/src/tests/sql/ddl/snapshots/table/query_alter_table_if_exists_stub_should_pass.snap index df83e64f8..5ed706f75 100644 --- a/crates/core-executor/src/tests/sql/ddl/snapshots/table/query_alter_table_if_exists_stub_should_pass.snap +++ b/crates/core-executor/src/tests/sql/ddl/snapshots/table/query_alter_table_if_exists_stub_should_pass.snap @@ -5,9 +5,10 @@ info: "Setup queries: CREATE SCHEMA embucket.test; CREATE TABLE embucket.test.so --- Ok( [ - "+--------+", - "| status |", - "+--------+", - "+--------+", + "+----------------------------------+", + "| status |", + "+----------------------------------+", + "| Statement executed successfully. |", + "+----------------------------------+", ], ) diff --git a/crates/core-executor/src/tests/sql/ddl/snapshots/table/query_alter_table_stub_should_pass.snap b/crates/core-executor/src/tests/sql/ddl/snapshots/table/query_alter_table_stub_should_pass.snap index 00d84af59..922d01114 100644 --- a/crates/core-executor/src/tests/sql/ddl/snapshots/table/query_alter_table_stub_should_pass.snap +++ b/crates/core-executor/src/tests/sql/ddl/snapshots/table/query_alter_table_stub_should_pass.snap @@ -5,9 +5,10 @@ info: "Setup queries: CREATE SCHEMA embucket.test; CREATE TABLE embucket.test.so --- Ok( [ - "+--------+", - "| status |", - "+--------+", - "+--------+", + "+----------------------------------+", + "| status |", + "+----------------------------------+", + "| Statement executed successfully. |", + "+----------------------------------+", ], ) diff --git a/crates/core-executor/src/tests/sql/ddl/snapshots/table/query_drop_table_if_exists_missing_table_should_pass.snap b/crates/core-executor/src/tests/sql/ddl/snapshots/table/query_drop_table_if_exists_missing_table_should_pass.snap index 15fc61b3c..9f5eba157 100644 --- a/crates/core-executor/src/tests/sql/ddl/snapshots/table/query_drop_table_if_exists_missing_table_should_pass.snap +++ b/crates/core-executor/src/tests/sql/ddl/snapshots/table/query_drop_table_if_exists_missing_table_should_pass.snap @@ -4,9 +4,10 @@ description: "\"DROP TABLE IF EXISTS embucket.public.missing\"" --- Ok( [ - "+--------+", - "| status |", - "+--------+", - "+--------+", + "+----------------------------------+", + "| status |", + "+----------------------------------+", + "| Statement executed successfully. |", + "+----------------------------------+", ], ) diff --git a/crates/core-executor/src/tests/sql/ddl/snapshots/table/query_drop_table_if_exists_uppercase_quoted_table_name.snap b/crates/core-executor/src/tests/sql/ddl/snapshots/table/query_drop_table_if_exists_uppercase_quoted_table_name.snap index 986361115..475f7a90c 100644 --- a/crates/core-executor/src/tests/sql/ddl/snapshots/table/query_drop_table_if_exists_uppercase_quoted_table_name.snap +++ b/crates/core-executor/src/tests/sql/ddl/snapshots/table/query_drop_table_if_exists_uppercase_quoted_table_name.snap @@ -5,9 +5,10 @@ info: "Setup queries: CREATE SCHEMA embucket.public_snowplow_manifest; CREATE TA --- Ok( [ - "+--------+", - "| status |", - "+--------+", - "+--------+", + "+----------------------------------+", + "| status |", + "+----------------------------------+", + "| Statement executed successfully. |", + "+----------------------------------+", ], ) diff --git a/crates/core-executor/src/tests/sql/ddl/snapshots/table/query_drop_table_stub_should_pass.snap b/crates/core-executor/src/tests/sql/ddl/snapshots/table/query_drop_table_stub_should_pass.snap index 427871986..1d9d0d599 100644 --- a/crates/core-executor/src/tests/sql/ddl/snapshots/table/query_drop_table_stub_should_pass.snap +++ b/crates/core-executor/src/tests/sql/ddl/snapshots/table/query_drop_table_stub_should_pass.snap @@ -5,9 +5,10 @@ info: "Setup queries: CREATE SCHEMA embucket.test; CREATE TABLE embucket.test.so --- Ok( [ - "+--------+", - "| status |", - "+--------+", - "+--------+", + "+----------------------------------+", + "| status |", + "+----------------------------------+", + "| Statement executed successfully. |", + "+----------------------------------+", ], )