fix: remove sqlformat (#3545)

* removed sqlformat from sql-core/src/logger.rs causing ref error to FormatOptions * removed sqlformat from sql-core/src/logger.rs causing ref error to FormatOptions --------- Co-authored-by: tbarnes <tbarnes@tbserver.tbarnes-server.local>
launchbadge · Oct 5, 2024 · cadf152 · cadf152
1 parent 19f40d8
commit cadf152
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 32 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/sqlx-core/Cargo.toml b/sqlx-core/Cargo.toml
@@ -69,7 +69,7 @@ regex = { version = "1.5.5", optional = true }
 serde = { version = "1.0.132", features = ["derive", "rc"], optional = true }
 serde_json = { version = "1.0.73", features = ["raw_value"], optional = true }
 sha2 = { version = "0.10.0", default-features = false, optional = true }
-sqlformat = "0.2.0"
+#sqlformat = "0.2.0"
 thiserror = "1.0.30"
 tokio-stream = { version = "0.1.8", features = ["fs"], optional = true }
 tracing = { version = "0.1.37", features = ["log"] }

diff --git a/sqlx-core/src/logger.rs b/sqlx-core/src/logger.rs
@@ -60,8 +60,6 @@ pub(crate) fn private_level_filter_to_trace_level(
     private_level_filter_to_levels(filter).map(|(level, _)| level)
 }
 
-pub use sqlformat;
-
 pub struct QueryLogger<'q> {
     sql: &'q str,
     rows_returned: u64,
@@ -112,11 +110,12 @@ impl<'q> QueryLogger<'q> {
                     summary.push_str(" …");
                     format!(
                         "\n\n{}\n",
-                        sqlformat::format(
-                            self.sql,
-                            &sqlformat::QueryParams::None,
-                            sqlformat::FormatOptions::default()
-                        )
+                        self.sql /*
+                                 sqlformat::format(
+                                     self.sql,
+                                     &sqlformat::QueryParams::None,
+                                     sqlformat::FormatOptions::default()
+                                 )*/
                     )
                 } else {
                     String::new()

diff --git a/sqlx-sqlite/src/logger.rs b/sqlx-sqlite/src/logger.rs
@@ -416,11 +416,13 @@ impl<'q, R: Debug, S: Debug + DebugDiff, P: Debug> QueryPlanLogger<'q, R, S, P>
             summary.push_str(" …");
             format!(
                 "\n\n{}\n",
-                sqlformat::format(
-                    self.sql,
-                    &sqlformat::QueryParams::None,
-                    sqlformat::FormatOptions::default()
-                )
+                self.sql /*
+                         sqlformat::format(
+                             self.sql,
+                             &sqlformat::QueryParams::None,
+                             sqlformat::FormatOptions::default()
+                         )
+                         */
             )
         } else {
             String::new()

diff --git a/src/ty_match.rs b/src/ty_match.rs
@@ -128,7 +128,7 @@ pub fn dupe_value<T>(_t: &T) -> T {
 
 #[test]
 fn test_dupe_value() {
-    let ref val = (String::new(),);
+    let val = &(String::new(),);
 
     if false {
         let _: i32 = dupe_value(&0i32);