test(cubesql): Format JSON part of TestConnectionTransport SQL output

Author: mcheshkov

rust/cubesql/cubesql/src/compile/mod.rs

@@ -7278,13 +7278,15 @@ ORDER BY
             .sql
             .contains("ungrouped"));
 
-        assert!(query_plan
-            .as_logical_plan()
-            .find_cube_scan_wrapper()
-            .wrapped_sql
-            .unwrap()
-            .sql
-            .contains("[\"dim2\",\"asc\"]"));
+        let re = Regex::new(r#"\[[[:space:]]*"dim2",[[:space:]]*"asc"[[:space:]]*\]"#).unwrap();
+        assert!(re.is_match(
+            &query_plan
+                .as_logical_plan()
+                .find_cube_scan_wrapper()
+                .wrapped_sql
+                .unwrap()
+                .sql
+        ));
     }
 
     #[tokio::test]
@@ -13732,7 +13734,7 @@ ORDER BY "source"."str0" ASC
             if Rewriter::top_down_extractor_enabled() {
                 assert!(sql.contains("LIMIT 1000"));
             } else {
-                assert!(sql.contains("\"limit\":1000"));
+                assert!(sql.contains("\"limit\": 1000"));
             }
             assert!(sql.contains("% 7"));
 

rust/cubesql/cubesql/src/compile/test/mod.rs

@@ -795,7 +795,10 @@ impl TransportService for TestConnectionTransport {
         });
         Ok(SqlResponse {
             sql: SqlQuery::new(
-                format!("SELECT * FROM {}", serde_json::to_string(&inputs).unwrap()),
+                format!(
+                    "SELECT * FROM {}",
+                    serde_json::to_string_pretty(&inputs).unwrap()
+                ),
                 expression_params.unwrap_or(Vec::new()),
             ),
         })

rust/cubesql/cubesql/src/compile/test/test_user_change.rs

@@ -271,6 +271,6 @@ GROUP BY 1
     let sql_query = load_calls[0].sql_query.as_ref().unwrap();
     // This should be placed from load meta to query by TestConnectionTransport::sql
     // It would mean that SQL generation used changed user
-    assert!(sql_query.sql.contains(r#""changeUser":"gopher""#));
+    assert!(sql_query.sql.contains(r#""changeUser": "gopher""#));
     assert_eq!(load_calls[0].meta.change_user(), Some("gopher".to_string()));
 }

rust/cubesql/cubesql/src/compile/test/test_wrapper.rs

@@ -426,7 +426,7 @@ async fn test_simple_subquery_wrapper_projection() {
         .wrapped_sql
         .unwrap()
         .sql
-        .contains("\\\\\\\"limit\\\\\\\":1"));
+        .contains("\\\\\\\"limit\\\\\\\": 1"));
 
     let _physical_plan = query_plan.as_physical_plan().await.unwrap();
 }
@@ -482,7 +482,7 @@ async fn test_simple_subquery_wrapper_filter_equal() {
         .wrapped_sql
         .unwrap()
         .sql
-        .contains("\\\\\\\"limit\\\\\\\":1"));
+        .contains("\\\\\\\"limit\\\\\\\": 1"));
 
     let _physical_plan = query_plan.as_physical_plan().await.unwrap();
 }