Add test to verify logged SQL matches executed statement

Author: ozgurcancal

tests/it/query_raw.rs

@@ -278,22 +278,43 @@ async fn complex_sql_with_question_marks() {
     assert_eq!(row.answer, "Yes?");
 }
 
-#[tokio::test]
-async fn query_raw_preserves_exact_sql() {
-    let client = prepare_database!();
-//check client
+#[tokio::test]            
+async fn query_matches_log() {
+    use uuid::Uuid;
 
-    // Test that raw query preserves the exact SQL including whitespace and formatting
-    let sql = "SELECT   1   WHERE   'test?'   =   'test?'   ";
+    // setup
+    let client   = prepare_database!();          
+    let query_id = Uuid::new_v4().to_string();   // unique per run
+    let sql      = "SELECT 1 WHERE 'x?' = 'x?'"; // raw statement to verify
 
-    let result = client.query_raw(sql).fetch_bytes("TSV").unwrap();
+    // execute with explicit query_id 
+    client
+        .query_raw(sql)
+        .with_option("query_id", &query_id)    
+        .execute()
+        .await
+        .expect("executing raw SQL failed");
 
-    let mut data = Vec::new();
-    let mut cursor = result;
-    while let Some(chunk) = cursor.next().await.unwrap() {
-        data.extend_from_slice(&chunk);
-    }
-    let response = String::from_utf8(data).unwrap();
+    crate::flush_query_log(&client).await;
 
-    assert_eq!(response.trim(), "1");
-}
+    // read log row *inline*
+    let log_sql = format!(
+        "SELECT query \
+         FROM system.query_log \
+         WHERE query_id = '{}' LIMIT 1",
+        query_id
+    );
+
+    let logged_sql: String = client
+        .query_raw(&log_sql)
+        .fetch_one()
+        .await
+        .expect("log entry not found");
+
+    // assertion
+    assert_eq!(
+        logged_sql.trim(),
+        sql.trim(),
+        "Logged SQL differs from the statement sent"
+    );
+}