Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: add a task to update Cargo.lock and update the dependencies (includes prql-compiler 0.9.3) #155

Merged
merged 2 commits into from
Aug 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Breaking changes

- Based on [`prql-compiler`](https://github.com/prql/prql) 0.9.2 (#130, #137, #142, #145)
- Based on [`prql-compiler`](https://github.com/prql/prql) 0.9.3 (#130, #137, #142, #145, #155)

## Bug fixes

Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.9.2.
This version supports PRQL 0.9.3.

## Installation

Expand Down Expand Up @@ -54,7 +54,7 @@ library(prqlr)
#> WHERE
#> cyl > 6
#>
#> -- Generated by PRQL compiler version:0.9.2 (https://prql-lang.org)
#> -- Generated by PRQL compiler version:0.9.3 (https://prql-lang.org)
```

PRQL’s pipelines can be joined by the newline character (`\n`), or
Expand All @@ -72,7 +72,7 @@ actual newlines in addition to `|`.
#> WHERE
#> cyl > 6
#>
#> -- Generated by PRQL compiler version:0.9.2 (https://prql-lang.org)
#> -- Generated by PRQL compiler version:0.9.3 (https://prql-lang.org)
```

``` r
Expand All @@ -89,7 +89,7 @@ select {cyl, mpg}" |>
#> WHERE
#> cyl > 6
#>
#> -- Generated by PRQL compiler version:0.9.2 (https://prql-lang.org)
#> -- Generated by PRQL compiler version:0.9.3 (https://prql-lang.org)
```

Thanks to the `{tidyquery}` package, we can even convert a PRQL query to
Expand Down
11 changes: 11 additions & 0 deletions Taskfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,19 @@ tasks:
cmds:
- cargo install cargo-license

cargo-update:
desc: Update the lock files.
sources:
- "{{.MANIFEST}}"
generates:
- "{{.CARGO_LOCK}}"
cmds:
- cargo update --manifest-path "{{.MANIFEST}}"

build-vendor-sources:
desc: Vendor Rust sources.
deps:
- cargo-update
sources:
- "{{.CARGO_LOCK}}"
- dev/vendoring.R
Expand Down
24 changes: 12 additions & 12 deletions inst/AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ backtrace (version 0.3.68):
bitflags (version 2.3.3):
The Rust Project Developers

cc (version 1.0.79):
cc (version 1.0.81):
Alex Crichton

cfg-if (version 1.0.0):
Expand All @@ -63,7 +63,7 @@ either (version 1.9.0):
enum-as-inner (version 0.6.0):
Benjamin Fry

errno (version 0.3.1):
errno (version 0.3.2):
Chris Wong

errno-dragonfly (version 0.1.2):
Expand Down Expand Up @@ -114,7 +114,7 @@ libR-sys (version 0.4.0):
libc (version 0.2.147):
The Rust Project Developers

linux-raw-sys (version 0.4.3):
linux-raw-sys (version 0.4.5):
Dan Gohman

log (version 0.4.19):
Expand Down Expand Up @@ -144,13 +144,13 @@ paste (version 1.0.14):
proc-macro2 (version 1.0.66):
David Tolnay, Alex Crichton

prql-ast (version 0.9.2):
prql-ast (version 0.9.3):
prql-ast authors

prql-compiler (version 0.9.2):
prql-compiler (version 0.9.3):
prql-compiler authors

prql-parser (version 0.9.2):
prql-parser (version 0.9.3):
prql-parser authors

psm (version 0.1.21):
Expand All @@ -162,7 +162,7 @@ quote (version 1.0.32):
regex (version 1.9.1):
The Rust Project Developers, Andrew Gallant

regex-automata (version 0.3.3):
regex-automata (version 0.3.4):
The Rust Project Developers, Andrew Gallant

regex-syntax (version 0.7.4):
Expand All @@ -171,7 +171,7 @@ regex-syntax (version 0.7.4):
rustc-demangle (version 0.1.23):
Alex Crichton

rustix (version 0.38.4):
rustix (version 0.38.6):
Dan Gohman, Jakub Konka

rustversion (version 1.0.14):
Expand All @@ -183,13 +183,13 @@ ryu (version 1.0.15):
semver (version 1.0.18):
David Tolnay

serde (version 1.0.175):
serde (version 1.0.180):
Erick Tryzelaar, David Tolnay

serde_derive (version 1.0.175):
serde_derive (version 1.0.180):
David Tolnay

serde_json (version 1.0.103):
serde_json (version 1.0.104):
Erick Tryzelaar, David Tolnay

sqlformat (version 0.2.1):
Expand All @@ -210,7 +210,7 @@ strum_macros (version 0.25.1):
syn (version 1.0.109):
David Tolnay

syn (version 2.0.27):
syn (version 2.0.28):
David Tolnay

unicode-ident (version 1.0.11):
Expand Down
57 changes: 30 additions & 27 deletions src/rust/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/rust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ name = "prqlr"

[dependencies]
extendr-api = "0.4.0"
prql-compiler = { version = "0.9.2", default-features = false }
prql-compiler = { version = "0.9.3", default-features = false }
anstream = { version = "0.3.2", features = ["auto"] }
4 changes: 2 additions & 2 deletions tests/testthat/_snaps/compile.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
FROM
a

-- Generated by PRQL compiler version:0.9.2 (https://prql-lang.org)
-- Generated by PRQL compiler version:0.9.3 (https://prql-lang.org)

---

Expand All @@ -29,7 +29,7 @@
FROM
star_wars

-- Generated by PRQL compiler version:0.9.2 target:sql.duckdb (https://prql-lang.org)
-- Generated by PRQL compiler version:0.9.3 target:sql.duckdb (https://prql-lang.org)

# Syntax error query=Mississippi has four S’s and four I’s.

Expand Down
4 changes: 2 additions & 2 deletions tests/testthat/_snaps/knitr-engine.md
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@
LIMIT
3

-- Generated by PRQL compiler version:0.9.2 (https://prql-lang.org)
-- Generated by PRQL compiler version:0.9.3 (https://prql-lang.org)
```


Expand Down Expand Up @@ -235,7 +235,7 @@
LIMIT
3

-- Generated by PRQL compiler version:0.9.2 (https://prql-lang.org)
-- Generated by PRQL compiler version:0.9.3 (https://prql-lang.org)
```

---
Expand Down
2 changes: 1 addition & 1 deletion tests/testthat/test-compile.R
Original file line number Diff line number Diff line change
Expand Up @@ -90,5 +90,5 @@ take 2
)

test_that("prql-compiler's version", {
expect_equal(prql_version(), numeric_version("0.9.2"))
expect_equal(prql_version(), numeric_version("0.9.3"))
})