diff --git a/Cargo.lock b/Cargo.lock index f19d69d6257..8324b49fadd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5306,7 +5306,7 @@ dependencies = [ "socket2", "thiserror 1.0.69", "tracing", - "winnow 0.6.20", + "winnow 0.6.26", ] [[package]] @@ -7948,6 +7948,7 @@ dependencies = [ "usdt", "usdt-impl", "uuid", + "winnow 0.6.26", "x509-cert", "zerocopy 0.7.35", "zerocopy 0.8.10", @@ -11921,12 +11922,12 @@ dependencies = [ [[package]] name = "sqlformat" -version = "0.2.6" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bba3a93db0cc4f7bdece8bb09e77e2e785c20bfebf79eb8340ed80708048790" +checksum = "a0d7b3e8a3b6f2ee93ac391a0f757c13790caa0147892e3545cd549dd5b54bc0" dependencies = [ - "nom", "unicode_categories", + "winnow 0.6.26", ] [[package]] @@ -14577,9 +14578,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.20" +version = "0.6.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" +checksum = "1e90edd2ac1aa278a5c4599b1d89cf03074b610800f866d4026dc199d7929a28" dependencies = [ "memchr", ] diff --git a/Cargo.toml b/Cargo.toml index 665296ac171..f9a376330d8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -686,7 +686,7 @@ smf = "0.2" socket2 = { version = "0.5", features = ["all"] } sp-sim = { path = "sp-sim" } sprockets-tls = { git = "https://github.com/oxidecomputer/sprockets.git", rev = "6d31fa63217c6a51061dc4afa1ebe175a0021981" } -sqlformat = "0.2.6" +sqlformat = "0.3.5" sqlparser = { version = "0.45.0", features = [ "visitor" ] } static_assertions = "1.1.0" # Please do not change the Steno version to a Git dependency. It makes it diff --git a/oximeter/db/src/shells/sql.rs b/oximeter/db/src/shells/sql.rs index bdc15204a76..cce852a3cdf 100644 --- a/oximeter/db/src/shells/sql.rs +++ b/oximeter/db/src/shells/sql.rs @@ -69,8 +69,8 @@ pub async fn shell( sqlformat::format( &transformed, &sqlformat::QueryParams::None, - sqlformat::FormatOptions { - uppercase: true, + &sqlformat::FormatOptions { + uppercase: Some(true), ..Default::default() } ) @@ -246,7 +246,10 @@ fn print_sql_query(query: &str) { sqlformat::format( &query, &sqlformat::QueryParams::None, - sqlformat::FormatOptions { uppercase: true, ..Default::default() } + &sqlformat::FormatOptions { + uppercase: Some(true), + ..Default::default() + } ) ); println!(); diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml index 8c4f4c52de9..58e19f565ad 100644 --- a/workspace-hack/Cargo.toml +++ b/workspace-hack/Cargo.toml @@ -342,6 +342,7 @@ mio = { version = "1.0.2", features = ["net", "os-ext"] } rustix = { version = "0.38.37", features = ["event", "fs", "net", "pipe", "process", "stdio", "system", "termios", "time"] } tokio-rustls = { version = "0.26.0", default-features = false, features = ["logging", "ring", "tls12"] } toml_edit-cdcf2f9584511fe6 = { package = "toml_edit", version = "0.19.15", features = ["serde"] } +winnow = { version = "0.6.26", features = ["simd"] } [target.x86_64-unknown-illumos.build-dependencies] bitflags-f595c2ba2a3f28df = { package = "bitflags", version = "2.9.0", default-features = false, features = ["std"] } @@ -357,5 +358,6 @@ mio = { version = "1.0.2", features = ["net", "os-ext"] } rustix = { version = "0.38.37", features = ["event", "fs", "net", "pipe", "process", "stdio", "system", "termios", "time"] } tokio-rustls = { version = "0.26.0", default-features = false, features = ["logging", "ring", "tls12"] } toml_edit-cdcf2f9584511fe6 = { package = "toml_edit", version = "0.19.15", features = ["serde"] } +winnow = { version = "0.6.26", features = ["simd"] } ### END HAKARI SECTION