From b87dd04d213bda422d09f27cbce52919fb7267f6 Mon Sep 17 00:00:00 2001 From: eitsupi <50911393+eitsupi@users.noreply.github.com> Date: Tue, 14 Nov 2023 22:46:39 +0900 Subject: [PATCH] feat: based on prql-compiler 0.10.1 (#229) --- DESCRIPTION | 2 +- LICENSE.note | 12 ++++++------ NEWS.md | 2 +- README.md | 17 ++++------------- src/rust/Cargo.lock | 27 ++++++++++++++------------- src/rust/Cargo.toml | 4 ++-- tests/testthat/_snaps/compile.md | 6 +++--- tests/testthat/_snaps/knitr-engine.md | 4 ++-- tools/lib-sums.tsv | 6 ------ 9 files changed, 33 insertions(+), 47 deletions(-) delete mode 100644 tools/lib-sums.tsv diff --git a/DESCRIPTION b/DESCRIPTION index dca185fd..b623ad73 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -46,4 +46,4 @@ Config/Needs/dev: tidyr Config/Needs/website: pkgdown -Config/prqlr/LibVersion: 0.10.0 +Config/prqlr/LibVersion: 0.10.1 diff --git a/LICENSE.note b/LICENSE.note index c8146262..38bf1a33 100644 --- a/LICENSE.note +++ b/LICENSE.note @@ -364,7 +364,7 @@ License: Apache-2.0 OR MIT ------------------------------------------------------------- Name: prql-compiler -Version: 0.10.0 +Version: 0.10.1 Repository: https://github.com/PRQL/prql Authors: prql-compiler authors License: Apache-2.0 @@ -372,7 +372,7 @@ License: Apache-2.0 ------------------------------------------------------------- Name: prqlc-ast -Version: 0.10.0 +Version: 0.10.1 Repository: https://github.com/PRQL/prql Authors: prqlc-ast authors License: Apache-2.0 @@ -380,7 +380,7 @@ License: Apache-2.0 ------------------------------------------------------------- Name: prqlc-parser -Version: 0.10.0 +Version: 0.10.1 Repository: https://github.com/PRQL/prql Authors: prqlc-parser authors License: Apache-2.0 @@ -468,7 +468,7 @@ License: Apache-2.0 OR MIT ------------------------------------------------------------- Name: serde -Version: 1.0.190 +Version: 1.0.192 Repository: https://github.com/serde-rs/serde Authors: Erick Tryzelaar, David Tolnay License: Apache-2.0 OR MIT @@ -476,7 +476,7 @@ License: Apache-2.0 OR MIT ------------------------------------------------------------- Name: serde_derive -Version: 1.0.190 +Version: 1.0.192 Repository: https://github.com/serde-rs/serde Authors: Erick Tryzelaar, David Tolnay License: Apache-2.0 OR MIT @@ -484,7 +484,7 @@ License: Apache-2.0 OR MIT ------------------------------------------------------------- Name: serde_json -Version: 1.0.107 +Version: 1.0.108 Repository: https://github.com/serde-rs/json Authors: Erick Tryzelaar, David Tolnay License: Apache-2.0 OR MIT diff --git a/NEWS.md b/NEWS.md index 539ea9f5..9b4a6598 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,7 +2,7 @@ ## Breaking changes -- Based on [`prql-compiler`](https://github.com/prql/prql) 0.10.0 (#221) +- Based on [`prql-compiler`](https://github.com/prql/prql) 0.10.1 (#221, #229) # prqlr 0.5.4 diff --git a/README.md b/README.md index 3e9bed6a..8ef15e80 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ R bindings for [the `prql-compiler` Rust library](https://github.com/prql/prql), powered by [the `extendr` framework](https://extendr.github.io/). -This version supports PRQL 0.10.0. +This version supports PRQL 0.10.1. ## Installation @@ -35,15 +35,6 @@ install.packages("prqlr") install.packages("prqlr", repos = "https://eitsupi.r-universe.dev") ``` -For source installation, pre-built Rust libraries may be available if -the environment variable `NOT_CRAN` is set to `"true"`. (Or, set -`LIBPRQLR_BUILD` to `"false"`) - -``` r -Sys.setenv(NOT_CRAN = "true") -install.packages("prqlr") -``` - Or, the Rust toolchain (Rust 1.65 or later) must be configured to build the Rust library. @@ -66,7 +57,7 @@ library(prqlr) #> WHERE #> cyl > 6 #> -#> -- Generated by PRQL compiler version:0.10.0 (https://prql-lang.org) +#> -- Generated by PRQL compiler version:0.10.1 (https://prql-lang.org) ``` PRQL’s pipelines can be joined by the newline character (`\n`), or @@ -84,7 +75,7 @@ actual newlines in addition to `|`. #> WHERE #> cyl > 6 #> -#> -- Generated by PRQL compiler version:0.10.0 (https://prql-lang.org) +#> -- Generated by PRQL compiler version:0.10.1 (https://prql-lang.org) ``` ``` r @@ -101,7 +92,7 @@ select {cyl, mpg}" |> #> WHERE #> cyl > 6 #> -#> -- Generated by PRQL compiler version:0.10.0 (https://prql-lang.org) +#> -- Generated by PRQL compiler version:0.10.1 (https://prql-lang.org) ``` Thanks to the `{tidyquery}` package, we can even convert a PRQL query to diff --git a/src/rust/Cargo.lock b/src/rust/Cargo.lock index 7bcc6d59..540f7510 100644 --- a/src/rust/Cargo.lock +++ b/src/rust/Cargo.lock @@ -391,9 +391,9 @@ dependencies = [ [[package]] name = "prql-compiler" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245e54abe336ce2937030501b132ba9363fdccb8a78cd553ecccf065b77860e5" +checksum = "89369450e8ed4e569bdd6b109f719a532d18a4b20e5e828bbd9905475c3276b5" dependencies = [ "anstream", "anyhow", @@ -417,9 +417,9 @@ dependencies = [ [[package]] name = "prqlc-ast" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ec908ca2bfd9d658a5db15e3b73d9d7a2d33d7c2a4c1f33393c6d7552000c94" +checksum = "e72a8626577e4f8e956c7e17acb909ce49374da61563afa7324feb250dc1bece" dependencies = [ "enum-as-inner", "semver", @@ -429,19 +429,20 @@ dependencies = [ [[package]] name = "prqlc-parser" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85ad56e613acd847c587b9f4b590e393aa34847a84b201dd152712056a7398c2" +checksum = "e69c749add52b45bf21ec316f489d8dee5eb64a8d65373849fc3176296c1b348" dependencies = [ "chumsky", "itertools", "prqlc-ast", "semver", + "stacker", ] [[package]] name = "prqlr" -version = "0.10.0" +version = "0.10.1" dependencies = [ "anstream", "extendr-api", @@ -537,18 +538,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.190" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" +checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.190" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" +checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" dependencies = [ "proc-macro2", "quote", @@ -557,9 +558,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ "itoa", "ryu", diff --git a/src/rust/Cargo.toml b/src/rust/Cargo.toml index ab8a7ab1..47587aaf 100644 --- a/src/rust/Cargo.toml +++ b/src/rust/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "prqlr" -version = "0.10.0" +version = "0.10.1" edition = "2021" rust-version = "1.65" publish = false @@ -11,5 +11,5 @@ name = "prqlr" [dependencies] extendr-api = "0.6.0" -prql-compiler = { version = "0.10.0", default-features = false } +prql-compiler = { version = "0.10.1", default-features = false } anstream = { version = "0.3.2", features = ["auto"] } diff --git a/tests/testthat/_snaps/compile.md b/tests/testthat/_snaps/compile.md index 2e44cc09..aa147c82 100644 --- a/tests/testthat/_snaps/compile.md +++ b/tests/testthat/_snaps/compile.md @@ -8,7 +8,7 @@ FROM a - -- Generated by PRQL compiler version:0.10.0 (https://prql-lang.org) + -- Generated by PRQL compiler version:0.10.1 (https://prql-lang.org) --- @@ -29,7 +29,7 @@ FROM star_wars - -- Generated by PRQL compiler version:0.10.0 target:sql.duckdb (https://prql-lang.org) + -- Generated by PRQL compiler version:0.10.1 target:sql.duckdb (https://prql-lang.org) # Syntax error query=Mississippi has four S’s and four I’s. @@ -380,5 +380,5 @@ Code prql_version() Output - [1] '0.10.0' + [1] '0.10.1' diff --git a/tests/testthat/_snaps/knitr-engine.md b/tests/testthat/_snaps/knitr-engine.md index 604fb7fd..abb98df3 100644 --- a/tests/testthat/_snaps/knitr-engine.md +++ b/tests/testthat/_snaps/knitr-engine.md @@ -183,7 +183,7 @@ LIMIT 3 - -- Generated by PRQL compiler version:0.10.0 (https://prql-lang.org) + -- Generated by PRQL compiler version:0.10.1 (https://prql-lang.org) ``` @@ -235,7 +235,7 @@ LIMIT 3 - -- Generated by PRQL compiler version:0.10.0 (https://prql-lang.org) + -- Generated by PRQL compiler version:0.10.1 (https://prql-lang.org) ``` --- diff --git a/tools/lib-sums.tsv b/tools/lib-sums.tsv deleted file mode 100644 index cd2410ad..00000000 --- a/tools/lib-sums.tsv +++ /dev/null @@ -1,6 +0,0 @@ -url sha256sum -https://github.com/eitsupi/prqlr/releases/download/lib-v0.10.0/libprqlr-0.10.0-aarch64-apple-darwin.tar.gz f91673869e17aff321afac91af5100750d4a5ae4926dc7d6113f92cbf3a9a08d -https://github.com/eitsupi/prqlr/releases/download/lib-v0.10.0/libprqlr-0.10.0-aarch64-unknown-linux-musl.tar.gz fb2aca5dd3021b90557cf7fce5ef8845bb338ab0c3fd1e3bf409f6f01fdfe33f -https://github.com/eitsupi/prqlr/releases/download/lib-v0.10.0/libprqlr-0.10.0-x86_64-apple-darwin.tar.gz dcda684723958e8079cb4c9d2098099ff5f3cf1dae046cfffb66ed15512857f7 -https://github.com/eitsupi/prqlr/releases/download/lib-v0.10.0/libprqlr-0.10.0-x86_64-pc-windows-gnu.tar.gz 796d11dd8d380a1543067a94792ed29660746780f70d73861d4b8d9cae49392e -https://github.com/eitsupi/prqlr/releases/download/lib-v0.10.0/libprqlr-0.10.0-x86_64-unknown-linux-musl.tar.gz eb608f2a82e08530b2b5ce7c6fcfb85f788000f8307b0ea6977d7175ecc4452d