Skip to content

Commit

Permalink
feat: based on prql-compiler 0.10.1 (#229)
Browse files Browse the repository at this point in the history
  • Loading branch information
eitsupi authored Nov 14, 2023
1 parent a634ef0 commit b87dd04
Show file tree
Hide file tree
Showing 9 changed files with 33 additions and 47 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@ Config/Needs/dev:
tidyr
Config/Needs/website:
pkgdown
Config/prqlr/LibVersion: 0.10.0
Config/prqlr/LibVersion: 0.10.1
12 changes: 6 additions & 6 deletions LICENSE.note
Original file line number Diff line number Diff line change
Expand Up @@ -364,23 +364,23 @@ 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

-------------------------------------------------------------

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

-------------------------------------------------------------

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
Expand Down Expand Up @@ -468,23 +468,23 @@ 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

-------------------------------------------------------------

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

-------------------------------------------------------------

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
Expand Down
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.10.0 (#221)
- Based on [`prql-compiler`](https://github.com/prql/prql) 0.10.1 (#221, #229)

# prqlr 0.5.4

Expand Down
17 changes: 4 additions & 13 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.10.0.
This version supports PRQL 0.10.1.

## Installation

Expand All @@ -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.

Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
27 changes: 14 additions & 13 deletions src/rust/Cargo.lock

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

4 changes: 2 additions & 2 deletions src/rust/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "prqlr"
version = "0.10.0"
version = "0.10.1"
edition = "2021"
rust-version = "1.65"
publish = false
Expand All @@ -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"] }
6 changes: 3 additions & 3 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.10.0 (https://prql-lang.org)
-- Generated by PRQL compiler version:0.10.1 (https://prql-lang.org)

---

Expand All @@ -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.

Expand Down Expand Up @@ -380,5 +380,5 @@
Code
prql_version()
Output
[1] '0.10.0'
[1] '0.10.1'

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.10.0 (https://prql-lang.org)
-- Generated by PRQL compiler version:0.10.1 (https://prql-lang.org)
```
Expand Down Expand Up @@ -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)
```

---
Expand Down
6 changes: 0 additions & 6 deletions tools/lib-sums.tsv

This file was deleted.

0 comments on commit b87dd04

Please sign in to comment.