diff --git a/Cargo.lock b/Cargo.lock index 471385a..52dca84 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -65,9 +65,9 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "arrow" -version = "54.3.1" +version = "55.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5ec52ba94edeed950e4a41f75d35376df196e8cb04437f7280a5aa49f20f796" +checksum = "f3f15b4c6b148206ff3a2b35002e08929c2462467b62b9c02036d9c34f9ef994" dependencies = [ "arrow-arith", "arrow-array", @@ -83,9 +83,9 @@ dependencies = [ [[package]] name = "arrow-arith" -version = "54.3.1" +version = "55.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc766fdacaf804cb10c7c70580254fcdb5d55cdfda2bc57b02baf5223a3af9e" +checksum = "30feb679425110209ae35c3fbf82404a39a4c0436bb3ec36164d8bffed2a4ce4" dependencies = [ "arrow-array", "arrow-buffer", @@ -97,9 +97,9 @@ dependencies = [ [[package]] name = "arrow-array" -version = "54.3.1" +version = "55.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12fcdb3f1d03f69d3ec26ac67645a8fe3f878d77b5ebb0b15d64a116c212985" +checksum = "70732f04d285d49054a48b72c54f791bb3424abae92d27aafdf776c98af161c8" dependencies = [ "ahash 0.8.11", "arrow-buffer", @@ -113,9 +113,9 @@ dependencies = [ [[package]] name = "arrow-buffer" -version = "54.3.1" +version = "55.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "263f4801ff1839ef53ebd06f99a56cecd1dbaf314ec893d93168e2e860e0291c" +checksum = "169b1d5d6cb390dd92ce582b06b23815c7953e9dfaaea75556e89d890d19993d" dependencies = [ "bytes", "half", @@ -124,9 +124,9 @@ dependencies = [ [[package]] name = "arrow-cast" -version = "54.3.1" +version = "55.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ede6175fbc039dfc946a61c1b6d42fd682fcecf5ab5d148fbe7667705798cac9" +checksum = "e4f12eccc3e1c05a766cafb31f6a60a46c2f8efec9b74c6e0648766d30686af8" dependencies = [ "arrow-array", "arrow-buffer", @@ -145,9 +145,9 @@ dependencies = [ [[package]] name = "arrow-data" -version = "54.3.1" +version = "55.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61cfdd7d99b4ff618f167e548b2411e5dd2c98c0ddebedd7df433d34c20a4429" +checksum = "8de1ce212d803199684b658fc4ba55fb2d7e87b213de5af415308d2fee3619c2" dependencies = [ "arrow-buffer", "arrow-schema", @@ -157,9 +157,9 @@ dependencies = [ [[package]] name = "arrow-ord" -version = "54.3.1" +version = "55.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0a3334a743bd2a1479dbc635540617a3923b4b2f6870f37357339e6b5363c21" +checksum = "6506e3a059e3be23023f587f79c82ef0bcf6d293587e3272d20f2d30b969b5a7" dependencies = [ "arrow-array", "arrow-buffer", @@ -170,9 +170,9 @@ dependencies = [ [[package]] name = "arrow-row" -version = "54.3.1" +version = "55.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d1d7a7291d2c5107e92140f75257a99343956871f3d3ab33a7b41532f79cb68" +checksum = "52bf7393166beaf79b4bed9bfdf19e97472af32ce5b6b48169d321518a08cae2" dependencies = [ "arrow-array", "arrow-buffer", @@ -183,18 +183,18 @@ dependencies = [ [[package]] name = "arrow-schema" -version = "54.3.1" +version = "55.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39cfaf5e440be44db5413b75b72c2a87c1f8f0627117d110264048f2969b99e9" +checksum = "af7686986a3bf2254c9fb130c623cdcb2f8e1f15763e7c71c310f0834da3d292" dependencies = [ "bitflags", ] [[package]] name = "arrow-select" -version = "54.3.1" +version = "55.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69efcd706420e52cd44f5c4358d279801993846d1c2a8e52111853d61d55a619" +checksum = "dd2b45757d6a2373faa3352d02ff5b54b098f5e21dccebc45a21806bc34501e5" dependencies = [ "ahash 0.8.11", "arrow-array", @@ -206,9 +206,9 @@ dependencies = [ [[package]] name = "arrow-string" -version = "54.3.1" +version = "55.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21546b337ab304a32cfc0770f671db7411787586b45b78b4593ae78e64e2b03" +checksum = "0377d532850babb4d927a06294314b316e23311503ed580ec6ce6a0158f49d40" dependencies = [ "arrow-array", "arrow-buffer", @@ -460,8 +460,9 @@ dependencies = [ [[package]] name = "duckdb" -version = "1.2.1" -source = "git+https://github.com/duckdb/duckdb-rs.git?rev=6ffcc70b4f1f67e19f3789b206cc22f4b8811468#6ffcc70b4f1f67e19f3789b206cc22f4b8811468" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07ab83a22530667ffc8cc0e31c0549bb07bea5dba3b957a8e315effc38923701" dependencies = [ "arrow", "cast", @@ -470,7 +471,6 @@ dependencies = [ "fallible-streaming-iterator", "hashlink", "libduckdb-sys", - "memchr", "num-integer", "rust_decimal", "serde_json", @@ -542,6 +542,12 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foldhash" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" + [[package]] name = "form_urlencoded" version = "1.2.1" @@ -600,35 +606,29 @@ dependencies = [ "ahash 0.7.8", ] -[[package]] -name = "hashbrown" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" -dependencies = [ - "ahash 0.8.11", -] - [[package]] name = "hashbrown" version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" +dependencies = [ + "foldhash", +] [[package]] name = "hashlink" -version = "0.9.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" +checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1" dependencies = [ - "hashbrown 0.14.5", + "hashbrown 0.15.2", ] [[package]] name = "heck" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "iana-time-zone" @@ -942,10 +942,10 @@ dependencies = [ [[package]] name = "libduckdb-sys" -version = "1.2.1" -source = "git+https://github.com/duckdb/duckdb-rs.git?rev=6ffcc70b4f1f67e19f3789b206cc22f4b8811468#6ffcc70b4f1f67e19f3789b206cc22f4b8811468" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e02f6069513efb67a0743aff3b846090de14763802b0e95c352ebc6e1bdc1da" dependencies = [ - "autocfg", "cc", "flate2", "pkg-config", @@ -1394,18 +1394,18 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" -version = "0.25.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +checksum = "f64def088c51c9510a8579e3c5d67c65349dcf755e5479ad3d010aa6454e2c32" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.25.3" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" +checksum = "c77a8c5abcaf0f9ce05d62342b7d298c346515365c36b673df4ebe3ced01fde8" dependencies = [ "heck", "proc-macro2", diff --git a/Cargo.toml b/Cargo.toml index 70cd9c3..be98e1f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,6 +6,7 @@ resolver = "2" [workspace.package] edition = "2024" version = "0.0.1" +license = "GPL-3.0-only" [workspace.lints.rust] unused_import_braces = "deny" @@ -59,8 +60,7 @@ expect_used = "warn" # [workspace.dependencies] -libduck-derive = { path = "crates/libduck-derive" } -libduck = { path = "crates/libduck" } +libduck-derive = { path = "crates/libduck-derive", version = "0.0.1" } uuid = { version = "1.16.0", features = ["serde", "v4", "v5"] } url = { version = "2.5.4", features = ["serde"] } @@ -77,3 +77,7 @@ quote = "1.0.40" paste = "1.0.15" static_assertions = "1.1.0" darling = "0.21.0" + +[workspace.dependencies.duckdb] +version = "1.3.2" +features = ["bundled", "parquet", "chrono", "json", "serde_json", "url", "uuid"] diff --git a/crates/libduck-derive/Cargo.toml b/crates/libduck-derive/Cargo.toml index 5f28f35..552f795 100644 --- a/crates/libduck-derive/Cargo.toml +++ b/crates/libduck-derive/Cargo.toml @@ -2,6 +2,8 @@ name = "libduck-derive" version = { workspace = true } edition = { workspace = true } +license = { workspace = true } +description = "Derive macros for libduck" [lints] workspace = true diff --git a/crates/libduck/Cargo.toml b/crates/libduck/Cargo.toml index 2113e4b..5745b38 100644 --- a/crates/libduck/Cargo.toml +++ b/crates/libduck/Cargo.toml @@ -2,6 +2,9 @@ name = "libduck" version = { workspace = true } edition = { workspace = true } +license = { workspace = true } +description = "duckdb macros & helpers" + [lints] workspace = true @@ -16,15 +19,4 @@ itertools = { workspace = true } url = { workspace = true } uuid = { workspace = true } utoipa = { workspace = true } - -# duckdb is only used by this crate, -# and re-exported everywhere else. - -# duckdb 1.2.1 is broken, https://github.com/duckdb/duckdb-rs/issues/467 -# 1.2.2 should fix those issues, but until then we must pull from git. -# duckdb = { version = "1.2.1", features = ["bundled", "parquet"] } - -[dependencies.duckdb] -git = "https://github.com/duckdb/duckdb-rs.git" -rev = "6ffcc70b4f1f67e19f3789b206cc22f4b8811468" -features = ["bundled", "parquet", "chrono", "json", "serde_json", "url", "uuid"] +duckdb = { workspace = true }