Skip to content

Commit bea29b9

Browse files
tbar4tbarnes
authored andcommitted
fix: remove sqlformat (launchbadge#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 <[email protected]>
1 parent caa6f18 commit bea29b9

File tree

5 files changed

+16
-32
lines changed

5 files changed

+16
-32
lines changed

Cargo.lock

+1-18
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sqlx-core/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ regex = { version = "1.5.5", optional = true }
6969
serde = { version = "1.0.132", features = ["derive", "rc"], optional = true }
7070
serde_json = { version = "1.0.73", features = ["raw_value"], optional = true }
7171
sha2 = { version = "0.10.0", default-features = false, optional = true }
72-
sqlformat = "0.2.0"
72+
#sqlformat = "0.2.0"
7373
thiserror = "1.0.30"
7474
tokio-stream = { version = "0.1.8", features = ["fs"], optional = true }
7575
tracing = { version = "0.1.37", features = ["log"] }

sqlx-core/src/logger.rs

+6-7
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ pub(crate) fn private_level_filter_to_trace_level(
6060
private_level_filter_to_levels(filter).map(|(level, _)| level)
6161
}
6262

63-
pub use sqlformat;
64-
6563
pub struct QueryLogger<'q> {
6664
sql: &'q str,
6765
rows_returned: u64,
@@ -112,11 +110,12 @@ impl<'q> QueryLogger<'q> {
112110
summary.push_str(" …");
113111
format!(
114112
"\n\n{}\n",
115-
sqlformat::format(
116-
self.sql,
117-
&sqlformat::QueryParams::None,
118-
sqlformat::FormatOptions::default()
119-
)
113+
self.sql /*
114+
sqlformat::format(
115+
self.sql,
116+
&sqlformat::QueryParams::None,
117+
sqlformat::FormatOptions::default()
118+
)*/
120119
)
121120
} else {
122121
String::new()

sqlx-sqlite/src/logger.rs

+7-5
Original file line numberDiff line numberDiff line change
@@ -416,11 +416,13 @@ impl<'q, R: Debug, S: Debug + DebugDiff, P: Debug> QueryPlanLogger<'q, R, S, P>
416416
summary.push_str(" …");
417417
format!(
418418
"\n\n{}\n",
419-
sqlformat::format(
420-
self.sql,
421-
&sqlformat::QueryParams::None,
422-
sqlformat::FormatOptions::default()
423-
)
419+
self.sql /*
420+
sqlformat::format(
421+
self.sql,
422+
&sqlformat::QueryParams::None,
423+
sqlformat::FormatOptions::default()
424+
)
425+
*/
424426
)
425427
} else {
426428
String::new()

src/ty_match.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ pub fn dupe_value<T>(_t: &T) -> T {
128128

129129
#[test]
130130
fn test_dupe_value() {
131-
let ref val = (String::new(),);
131+
let val = &(String::new(),);
132132

133133
if false {
134134
let _: i32 = dupe_value(&0i32);

0 commit comments

Comments
 (0)