diff --git a/tests-integration/tests/table_ddl_event.rs b/tests-integration/tests/table_ddl_event.rs index e170e0304a..5c23e101de 100644 --- a/tests-integration/tests/table_ddl_event.rs +++ b/tests-integration/tests/table_ddl_event.rs @@ -90,7 +90,7 @@ async fn test_table_ddl_procedure_events() { "create_table", &auto_create_procedure_id, "auto_create", - "prometheus", + Some("prometheus"), ) .await; @@ -102,7 +102,7 @@ async fn test_table_ddl_procedure_events() { "create_table", &auto_influx_create_procedure_id, "auto_create", - "influx", + Some("influx"), ) .await; @@ -151,7 +151,7 @@ async fn test_table_ddl_procedure_events() { "create_table", &grpc_create_procedure_id, "manual", - "grpc", + Some("grpc"), ) .await; GrpcQueryHandler::do_query( @@ -190,7 +190,7 @@ async fn test_table_ddl_procedure_events() { "alter_table", &grpc_alter_procedure_id, "manual", - "grpc", + Some("grpc"), ) .await; @@ -215,7 +215,7 @@ async fn test_table_ddl_procedure_events() { "create_table", &create_table_procedure_id, "manual", - "httpsql", + Some("httpsql"), ) .await; assert_named_submitted_event( @@ -257,7 +257,7 @@ async fn test_table_ddl_procedure_events() { "alter_table", &alter_table_procedure_id, "manual", - "httpsql", + Some("httpsql"), ) .await; assert_named_submitted_event( @@ -303,7 +303,7 @@ async fn test_table_ddl_procedure_events() { "truncate_table", &truncate_table_procedure_id, "manual", - "httpsql", + Some("httpsql"), ) .await; assert_named_submitted_event( @@ -346,7 +346,7 @@ async fn test_table_ddl_procedure_events() { "drop_table", &drop_table_procedure_id, "manual", - "httpsql", + Some("httpsql"), ) .await; assert_named_submitted_event( @@ -389,7 +389,7 @@ async fn test_table_ddl_procedure_events() { "undrop_table", &undrop_table_procedure_id, "manual", - "unknown", + None, ) .await; assert_id_submitted_event( @@ -431,7 +431,7 @@ async fn test_table_ddl_procedure_events() { "purge_dropped_table", &purge_table_procedure_id, "manual", - "unknown", + None, ) .await; assert_id_submitted_event( @@ -487,7 +487,7 @@ async fn test_table_ddl_procedure_events() { "create_logical_tables", &create_logical_tables_procedure_id, "manual", - "httpsql", + Some("httpsql"), ) .await; @@ -540,7 +540,7 @@ async fn test_table_ddl_procedure_events() { "alter_logical_tables", &alter_logical_tables_procedure_id, "manual", - "httpsql", + Some("httpsql"), ) .await; assert_named_submitted_event( @@ -635,7 +635,7 @@ async fn assert_event_context( event_type: &str, procedure_id: &str, reason: &str, - protocol: &str, + protocol: Option<&str>, ) { let event_filter = format!( "FROM {EVENTS_TABLE} WHERE {} = '{event_type}' AND {} = '{procedure_id}' AND json_get_string({}, 'type') = 'Submitted'", @@ -655,7 +655,10 @@ async fn assert_event_context( "event_context", ) .await; - let expected = format!(r#"{{"protocol":"{protocol}","reason":"{reason}"}}"#); + let expected = match protocol { + Some(protocol) => format!(r#"{{"protocol":"{protocol}","reason":"{reason}"}}"#), + None => format!(r#"{{"reason":"{reason}"}}"#), + }; assert_eq!(expected, actual); }