diff --git a/Cargo.lock b/Cargo.lock index 1049c71..5ac011c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -825,9 +825,9 @@ dependencies = [ [[package]] name = "delta_kernel" -version = "0.27.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7e8eed9c45dacf1a844abbe78b86d0806df22e4ac4402a387f5de16528ea00" +checksum = "00ba53f3a73c154d023528e9448028ec81f04724fb93bfde37d04f6d69f5115f" dependencies = [ "arrow", "bytes", @@ -856,9 +856,9 @@ dependencies = [ [[package]] name = "delta_kernel_default_engine" -version = "0.27.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "359fc97a5e6859d1c2592c4600e39ee0dc2e4f9f27f88720c7195e44a858dab2" +checksum = "375180c738f998f72ab12b3ee94e5cfadb406f8d2a7c2d2039a6b168f1cdf93d" dependencies = [ "async-stream", "async-trait", @@ -877,9 +877,9 @@ dependencies = [ [[package]] name = "delta_kernel_derive" -version = "0.27.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b25ae700f43ea9506a97bf93c54a1fde5a0d64ad0e19b3e0ebbe91761cdeeddc" +checksum = "949d8d89c6acad114297d0ffaa35abd593bd87a974472240c6a0400394f71e83" dependencies = [ "proc-macro2", "quote", @@ -2292,7 +2292,7 @@ dependencies = [ "once_cell", "socket2", "tracing", - "windows-sys 0.60.2", + "windows-sys 0.59.0", ] [[package]] @@ -3354,6 +3354,7 @@ dependencies = [ "idna", "percent-encoding", "serde", + "serde_derive", ] [[package]] @@ -3697,15 +3698,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "windows-sys" -version = "0.60.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" -dependencies = [ - "windows-targets 0.53.5", -] - [[package]] name = "windows-sys" version = "0.61.2" @@ -3739,30 +3731,13 @@ dependencies = [ "windows_aarch64_gnullvm 0.52.6", "windows_aarch64_msvc 0.52.6", "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm 0.52.6", + "windows_i686_gnullvm", "windows_i686_msvc 0.52.6", "windows_x86_64_gnu 0.52.6", "windows_x86_64_gnullvm 0.52.6", "windows_x86_64_msvc 0.52.6", ] -[[package]] -name = "windows-targets" -version = "0.53.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" -dependencies = [ - "windows-link", - "windows_aarch64_gnullvm 0.53.1", - "windows_aarch64_msvc 0.53.1", - "windows_i686_gnu 0.53.1", - "windows_i686_gnullvm 0.53.1", - "windows_i686_msvc 0.53.1", - "windows_x86_64_gnu 0.53.1", - "windows_x86_64_gnullvm 0.53.1", - "windows_x86_64_msvc 0.53.1", -] - [[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" @@ -3775,12 +3750,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" - [[package]] name = "windows_aarch64_msvc" version = "0.42.2" @@ -3793,12 +3762,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" -[[package]] -name = "windows_aarch64_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" - [[package]] name = "windows_i686_gnu" version = "0.42.2" @@ -3811,24 +3774,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" -[[package]] -name = "windows_i686_gnu" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" - [[package]] name = "windows_i686_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" -[[package]] -name = "windows_i686_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" - [[package]] name = "windows_i686_msvc" version = "0.42.2" @@ -3841,12 +3792,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" -[[package]] -name = "windows_i686_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" - [[package]] name = "windows_x86_64_gnu" version = "0.42.2" @@ -3859,12 +3804,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" -[[package]] -name = "windows_x86_64_gnu" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" - [[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" @@ -3877,12 +3816,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" - [[package]] name = "windows_x86_64_msvc" version = "0.42.2" @@ -3895,12 +3828,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" -[[package]] -name = "windows_x86_64_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" - [[package]] name = "winnow" version = "1.0.1" diff --git a/Cargo.toml b/Cargo.toml index 87d3faa..d5c7c76 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,8 +14,8 @@ categories = ["command-line-utilities", "database"] authors = ["Christian Del Monte"] [dependencies] -delta_kernel = { version = "0.27", features = ["arrow"] } -delta_kernel_default_engine = { version = "0.27", features = ["arrow", "rustls"] } +delta_kernel = { version = "0.28", features = ["arrow"] } +delta_kernel_default_engine = { version = "0.28", features = ["arrow", "rustls"] } clap = { version = "4", features = ["derive"] } url = "2" num-format = "0.4" diff --git a/src/analysis/kernel/literal.rs b/src/analysis/kernel/literal.rs index a235a51..e2065d1 100644 --- a/src/analysis/kernel/literal.rs +++ b/src/analysis/kernel/literal.rs @@ -1,4 +1,4 @@ -use delta_kernel::expressions::{DecimalData, Expression, Scalar}; +use delta_kernel::expressions::{DecimalData, Expression, Scalar, null_lit}; use delta_kernel::schema::{DataType, PrimitiveType}; use crate::analysis::predicate::Literal; @@ -41,9 +41,7 @@ pub(super) fn literal_expr( // // STRING is only the fallback when no type information is // available. - Literal::Null => Ok(Expression::null_literal( - type_hint.cloned().unwrap_or(DataType::STRING), - )), + Literal::Null => Ok(null_lit(type_hint.cloned().unwrap_or(DataType::STRING))), // The column type wins when available. For example, a SQL DATE // literal compared to TIMESTAMP should be emitted as the column