diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 7bbe921c053f..52679a78ebc9 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -135,11 +135,11 @@ jobs: run: echo "run=${{ steps.changes.outputs.nightly == 'true' || contains(github.event.pull_request.labels.*.name, 'pr-nightly') || - github.event.schedule }}" >>"$GITHUB_OUTPUT" + github.event_name == 'schedule' }}" >>"$GITHUB_OUTPUT" - id: nightly-schedule run: - echo "run=${{ github.event.schedule == 'true' }}" >>"$GITHUB_OUTPUT" + echo "run=${{ github.event_name == 'schedule' }}" >>"$GITHUB_OUTPUT" - id: main run: @@ -689,9 +689,10 @@ jobs: needs: - check-ok-to-merge if: - # We care that it's on a schedule as well as it running on nightly — we + # We check that it's on a schedule as well as it running on nightly — we # don't want to trigger just on a `pr-nightly` label - always() && github.event.schedule && contains(needs.*.result, 'failure') + always() && (github.event_name == 'schedule') && contains(needs.*.result, + 'failure') permissions: contents: read issues: write diff --git a/Cargo.lock b/Cargo.lock index 812d6b826162..a0de528ffccb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -331,7 +331,7 @@ checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -426,7 +426,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -482,7 +482,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", "syn_derive", ] @@ -752,7 +752,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -1105,7 +1105,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -1116,7 +1116,7 @@ checksum = "1d1545d67a2149e1d93b7e5c7752dce5a7426eb5d1357ddcfd89336b94444f77" dependencies = [ "darling_core", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -1136,7 +1136,7 @@ checksum = "61bb5a1014ce6dfc2a378578509abe775a5aa06bff584a547555d9efdb81b926" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -1254,7 +1254,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -1274,7 +1274,7 @@ checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -1424,7 +1424,7 @@ checksum = "b0fa992f1656e1707946bbba340ad244f0814009ef8c0118eb7b658395f19a2e" dependencies = [ "frunk_proc_macro_helpers", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -1436,7 +1436,7 @@ dependencies = [ "frunk_core", "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -1448,7 +1448,7 @@ dependencies = [ "frunk_core", "frunk_proc_macro_helpers", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -1522,7 +1522,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -2120,7 +2120,7 @@ dependencies = [ "itertools 0.12.1", "lutra", "pyo3", - "pyo3-build-config", + "pyo3-build-config 0.21.2", ] [[package]] @@ -2288,7 +2288,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", "termcolor", "thiserror", ] @@ -2545,7 +2545,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -2654,7 +2654,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -2841,9 +2841,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.80" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56dea16b0a29e94408b9aa5e2940a4eedbd128a1ba20e8f7ae60fd3d465af0e" +checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" dependencies = [ "unicode-ident", ] @@ -2868,7 +2868,7 @@ name = "prql-compiler-macros" version = "0.11.5" dependencies = [ "prqlc", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -2984,7 +2984,7 @@ dependencies = [ "insta", "prqlc", "pyo3", - "pyo3-build-config", + "pyo3-build-config 0.21.2", ] [[package]] @@ -3059,7 +3059,7 @@ dependencies = [ "libc", "memoffset", "parking_lot", - "pyo3-build-config", + "pyo3-build-config 0.20.2", "pyo3-ffi", "pyo3-macros", "unindent", @@ -3075,6 +3075,16 @@ dependencies = [ "target-lexicon", ] +[[package]] +name = "pyo3-build-config" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7883df5835fafdad87c0d888b266c8ec0f4c9ca48a5bed6bbb592e8dedee1b50" +dependencies = [ + "once_cell", + "target-lexicon", +] + [[package]] name = "pyo3-ffi" version = "0.20.2" @@ -3082,7 +3092,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dbb7dec17e17766b46bca4f1a4215a85006b4c2ecde122076c562dd058da6cf1" dependencies = [ "libc", - "pyo3-build-config", + "pyo3-build-config 0.20.2", ] [[package]] @@ -3094,7 +3104,7 @@ dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -3106,14 +3116,14 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -3316,7 +3326,7 @@ dependencies = [ "regex", "relative-path", "rustc_version", - "syn 2.0.59", + "syn 2.0.60", "unicode-ident", ] @@ -3405,7 +3415,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -3549,29 +3559,29 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.197" +version = "1.0.198" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.198" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] name = "serde_json" -version = "1.0.115" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" +checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" dependencies = [ "itoa", "ryu", @@ -3719,9 +3729,9 @@ dependencies = [ [[package]] name = "sqlparser" -version = "0.44.0" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaf9c7ff146298ffda83a200f8d5084f08dcee1edfc135fcc1d646a45d50ffd6" +checksum = "f7bbffee862a796d67959a89859d6b1046bb5016d63e23835ad0da182777bbe0" dependencies = [ "log", "serde", @@ -3791,7 +3801,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -3804,7 +3814,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -3836,9 +3846,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.59" +version = "2.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a6531ffc7b071655e4ce2e04bd464c4830bb585a61cabb96cf808f05172615a" +checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" dependencies = [ "proc-macro2", "quote", @@ -3854,7 +3864,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -3914,14 +3924,13 @@ dependencies = [ [[package]] name = "test_each_file" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630b9555661db8c2097f267a20f14559ff6044bc1a63bd469246245e6ad996aa" +checksum = "0f1a92330478de0709111391059475f7d960692519e2c54c823c662408bab365" dependencies = [ - "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", "unicode-ident", ] @@ -3951,7 +3960,7 @@ checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -4085,7 +4094,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -4192,7 +4201,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -4420,7 +4429,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", "wasm-bindgen-shared", ] @@ -4454,7 +4463,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4487,7 +4496,7 @@ checksum = "b7f89739351a2e03cb94beb799d47fb2cac01759b40ec441f7de39b00cbf7ef0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -4826,7 +4835,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 2bb77bd4c39e..cfc99021dc90 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -50,4 +50,4 @@ insta = {version = "1.38.0", features = ["colors", "glob", "yaml"]} insta-cmd = "0.4.0" itertools = "0.12.0" log = "0.4.21" -serde = {version = "1.0.197", features = ["derive"]} +serde = {version = "1.0.198", features = ["derive"]} diff --git a/lutra/bindings/python/Cargo.toml b/lutra/bindings/python/Cargo.toml index 6aafec9f6b66..99e47ee1f7c9 100644 --- a/lutra/bindings/python/Cargo.toml +++ b/lutra/bindings/python/Cargo.toml @@ -22,7 +22,7 @@ lutralib = {package = "lutra", path = "../../lutra", default-features = false} pyo3 = {version = "0.20.2", features = ["abi3-py37", "anyhow"]} [build-dependencies] -pyo3-build-config = "0.20.2" +pyo3-build-config = "0.21.2" [package.metadata.release] tag-name = "{{version}}" diff --git a/prqlc/bindings/prqlc-c/Cargo.toml b/prqlc/bindings/prqlc-c/Cargo.toml index d2f00e31fe63..8c75b3d4a7c7 100644 --- a/prqlc/bindings/prqlc-c/Cargo.toml +++ b/prqlc/bindings/prqlc-c/Cargo.toml @@ -24,7 +24,7 @@ doc = false [dependencies] libc = "0.2.153" prqlc = {path = "../../prqlc", default-features = false} -serde_json = "1.0.115" +serde_json = "1.0.116" [package.metadata.release] tag-name = "{{version}}" diff --git a/prqlc/bindings/prqlc-python/Cargo.toml b/prqlc/bindings/prqlc-python/Cargo.toml index 0656c8ef7e47..254bdee1501b 100644 --- a/prqlc/bindings/prqlc-python/Cargo.toml +++ b/prqlc/bindings/prqlc-python/Cargo.toml @@ -26,7 +26,7 @@ prqlc_lib = {package = "prqlc", path = "../../prqlc", default-features = false} insta = {workspace = true} [build-dependencies] -pyo3-build-config = "0.20.2" +pyo3-build-config = "0.21.2" [package.metadata.release] tag-name = "{{version}}" diff --git a/prqlc/prql-compiler-macros/Cargo.toml b/prqlc/prql-compiler-macros/Cargo.toml index 2101ee6880f2..37f636b9164c 100644 --- a/prqlc/prql-compiler-macros/Cargo.toml +++ b/prqlc/prql-compiler-macros/Cargo.toml @@ -15,7 +15,7 @@ test = false [dependencies] prqlc = {path = "../prqlc", default-features = false, version = "0.11.5" } -syn = "2.0.59" +syn = "2.0.60" [package.metadata.release] tag-name = "{{version}}" diff --git a/prqlc/prqlc-ast/Cargo.toml b/prqlc/prqlc-ast/Cargo.toml index 4b1ea4556089..b0d5c00d435f 100644 --- a/prqlc/prqlc-ast/Cargo.toml +++ b/prqlc/prqlc-ast/Cargo.toml @@ -19,4 +19,4 @@ strum = {version = "0.26.2", features = ["std", "derive"]} [dev-dependencies] insta = {workspace = true} -serde_json = "1.0.115" +serde_json = "1.0.116" diff --git a/prqlc/prqlc/Cargo.toml b/prqlc/prqlc/Cargo.toml index eaf6c4ff0809..a513b5d916e2 100644 --- a/prqlc/prqlc/Cargo.toml +++ b/prqlc/prqlc/Cargo.toml @@ -48,10 +48,10 @@ regex = "1.10.4" semver = {version = "1.0.22", features = ["serde"]} # We could put `serde` behind a feature if we wanted to reduce the size of prqlc. serde = {workspace = true} -serde_json = "1.0.115" +serde_json = "1.0.116" serde_yaml = {version = "0.9.34"} sqlformat = "0.2.3" -sqlparser = {version = "0.44.0", features = ["serde"]} +sqlparser = {version = "0.45.0", features = ["serde"]} strum = {version = "0.26.2", features = ["std", "derive"]} strum_macros = "0.26.2" @@ -97,7 +97,7 @@ insta-cmd = {workspace = true} rstest = "0.18.2" similar = {version = "2.5.0"} similar-asserts = "1.5.0" -test_each_file = "0.3.1" +test_each_file = "0.3.2" [target.'cfg(not(target_family="wasm"))'.dev-dependencies] criterion = {version = "0.5.1"} diff --git a/prqlc/prqlc/src/lib.rs b/prqlc/prqlc/src/lib.rs index c07771b364dc..cb680056d9e4 100644 --- a/prqlc/prqlc/src/lib.rs +++ b/prqlc/prqlc/src/lib.rs @@ -71,7 +71,7 @@ //! //! * `serde_yaml`: adapts the `Serialize` implementation for //! [`crate::ast::expr::ExprKind::Literal`] within -//! [`prqlc::ir::rq::expr::ExprKind`] to a custom one for `serde_yaml`, which +//! [`crate::ir::rq::ExprKind`] to a custom one for `serde_yaml`, which //! doesn't support the serialization of nested enums. //! //! ## Large binary sizes diff --git a/prqlc/prqlc/src/sql/gen_expr.rs b/prqlc/prqlc/src/sql/gen_expr.rs index c5245ba98386..3698852f82cc 100644 --- a/prqlc/prqlc/src/sql/gen_expr.rs +++ b/prqlc/prqlc/src/sql/gen_expr.rs @@ -372,7 +372,7 @@ pub(super) fn translate_literal(l: Literal, ctx: &Context) -> Result DateTimeField::Year, "months" => DateTimeField::Month, - "weeks" => DateTimeField::Week, + "weeks" => DateTimeField::Week(None), "days" => DateTimeField::Day, "hours" => DateTimeField::Hour, "minutes" => DateTimeField::Minute, @@ -675,6 +675,7 @@ fn translate_windowed( ); let window = WindowSpec { + window_name: None, partition_by: try_into_exprs(window.partition, ctx, span)?, order_by: (window.sort) .into_iter() diff --git a/web/book/Cargo.toml b/web/book/Cargo.toml index 28a39738b7ee..f064f86798ea 100644 --- a/web/book/Cargo.toml +++ b/web/book/Cargo.toml @@ -34,7 +34,7 @@ globset = "0.4.14" insta = {workspace = true} log = {workspace = true} regex = "1.10.4" -serde_json = "1.0.115" +serde_json = "1.0.116" serde_yaml = "0.9.34" similar-asserts = "1.5.0" walkdir = "2.5.0"