From 9887cab463d04d20fff5d6cd53070edde4dc1583 Mon Sep 17 00:00:00 2001 From: Maximilian Roos Date: Mon, 24 Jul 2023 21:39:57 -0700 Subject: [PATCH 1/2] build: Bump version to 0.9.0 --- .github/actions/build-prql-python/action.yaml | 2 +- .github/actions/build-prqlc/action.yaml | 2 +- .github/actions/time-compilation/action.yaml | 2 +- .github/workflows/build-web.yaml | 2 +- .github/workflows/test-all.yaml | 2 +- .github/workflows/test-lib.yaml | 2 +- .github/workflows/test-rust.yaml | 2 +- .github/workflows/test-taskfile.yaml | 2 +- Cargo.lock | 26 +++++++++---------- Cargo.toml | 2 +- bindings/prql-elixir/native/prql/Cargo.toml | 2 +- bindings/prql-js/package-lock.json | 4 +-- bindings/prql-js/package.json | 2 +- crates/prql_ast/Cargo.toml | 2 +- crates/prql_compiler_macros/Cargo.toml | 2 +- crates/prql_parser/Cargo.toml | 2 +- crates/prqlc/Cargo.toml | 2 +- crates/tests_misc/Cargo.toml | 2 +- web/book/src/language-features/target.md | 2 +- web/playground/package-lock.json | 6 ++--- web/playground/package.json | 2 +- 21 files changed, 36 insertions(+), 36 deletions(-) diff --git a/.github/actions/build-prql-python/action.yaml b/.github/actions/build-prql-python/action.yaml index a95a3cf46d17..1de46e4d0747 100644 --- a/.github/actions/build-prql-python/action.yaml +++ b/.github/actions/build-prql-python/action.yaml @@ -13,7 +13,7 @@ runs: - uses: Swatinem/rust-cache@v2 with: save-if: ${{ github.ref == 'refs/heads/main' }} - prefix-key: 0.8.1 + prefix-key: 0.9.0 - uses: messense/maturin-action@v1 if: inputs.target == 'source' with: diff --git a/.github/actions/build-prqlc/action.yaml b/.github/actions/build-prqlc/action.yaml index e47f3b1fd676..234ecada9038 100644 --- a/.github/actions/build-prqlc/action.yaml +++ b/.github/actions/build-prqlc/action.yaml @@ -24,7 +24,7 @@ runs: # Share cache with `test-rust` save-if: false shared-key: rust-${{ inputs.target }} - prefix-key: 0.8.1 + prefix-key: 0.9.0 - if: runner.os == 'Linux' shell: bash diff --git a/.github/actions/time-compilation/action.yaml b/.github/actions/time-compilation/action.yaml index ad32ac70ee16..95f581843c62 100644 --- a/.github/actions/time-compilation/action.yaml +++ b/.github/actions/time-compilation/action.yaml @@ -14,7 +14,7 @@ runs: uses: Swatinem/rust-cache@v2 with: save-if: ${{ github.ref == 'refs/heads/main' }} - prefix-key: 0.8.1 + prefix-key: 0.9.0 # 'true' seems to require quotes (and using a bare `inputs.use_cache` # doesn't work); I'm really not sure why. There are some issues on the # interwebs around this, but I couldn't find one that explained it. diff --git a/.github/workflows/build-web.yaml b/.github/workflows/build-web.yaml index 142779777f34..e2d255c1fa61 100644 --- a/.github/workflows/build-web.yaml +++ b/.github/workflows/build-web.yaml @@ -56,7 +56,7 @@ jobs: - name: 💰 Cache uses: Swatinem/rust-cache@v2 with: - prefix-key: 0.8.1 + prefix-key: 0.9.0 save-if: ${{ github.ref == 'refs/heads/web' || github.ref == 'refs/heads/main' }} diff --git a/.github/workflows/test-all.yaml b/.github/workflows/test-all.yaml index 6ec55215ab26..b9fcdd74b948 100644 --- a/.github/workflows/test-all.yaml +++ b/.github/workflows/test-all.yaml @@ -106,7 +106,7 @@ jobs: uses: Swatinem/rust-cache@v2 with: save-if: ${{ github.ref == 'refs/heads/main' }} - prefix-key: 0.8.1 + prefix-key: 0.9.0 - run: cargo tarpaulin --skip-clean --all-targets --features=test-dbs --out=Xml diff --git a/.github/workflows/test-lib.yaml b/.github/workflows/test-lib.yaml index 84c3ad441ada..ed65448ac462 100644 --- a/.github/workflows/test-lib.yaml +++ b/.github/workflows/test-lib.yaml @@ -23,7 +23,7 @@ jobs: - name: 💰 Cache uses: Swatinem/rust-cache@v2 with: - prefix-key: 0.8.1 + prefix-key: 0.9.0 save-if: ${{ github.ref == 'refs/heads/main' }} - name: Build uses: richb-hanover/cargo@v1.1.0 diff --git a/.github/workflows/test-rust.yaml b/.github/workflows/test-rust.yaml index c6550f4a88e9..f4e3319575fb 100644 --- a/.github/workflows/test-rust.yaml +++ b/.github/workflows/test-rust.yaml @@ -39,7 +39,7 @@ jobs: - name: 💰 Cache uses: Swatinem/rust-cache@v2 with: - prefix-key: 0.8.1 + prefix-key: 0.9.0 shared-key: rust-${{ inputs.target}} save-if: ${{ github.ref == 'refs/heads/main' }} - name: 📎 Clippy diff --git a/.github/workflows/test-taskfile.yaml b/.github/workflows/test-taskfile.yaml index 38745ea901b0..6d70b4878450 100644 --- a/.github/workflows/test-taskfile.yaml +++ b/.github/workflows/test-taskfile.yaml @@ -25,7 +25,7 @@ jobs: - name: 💰 Cache uses: Swatinem/rust-cache@v2 with: - prefix-key: 0.8.1 + prefix-key: 0.9.0 save-if: ${{ github.ref == 'refs/heads/main' }} - uses: actions/setup-python@v4 with: diff --git a/Cargo.lock b/Cargo.lock index 55ed9fd62c98..94903241f917 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -852,7 +852,7 @@ dependencies = [ [[package]] name = "compile-files" -version = "0.8.1" +version = "0.9.0" dependencies = [ "prql-compiler", ] @@ -2173,7 +2173,7 @@ dependencies = [ [[package]] name = "mdbook-prql" -version = "0.8.1" +version = "0.9.0" dependencies = [ "ansi-to-html", "anstream", @@ -2267,7 +2267,7 @@ dependencies = [ [[package]] name = "misc" -version = "0.0.0" +version = "0.9.0" dependencies = [ "insta", "regex", @@ -2870,7 +2870,7 @@ dependencies = [ [[package]] name = "prql" -version = "0.8.1" +version = "0.9.0" dependencies = [ "prql-compiler", "rustler", @@ -2878,7 +2878,7 @@ dependencies = [ [[package]] name = "prql-compiler" -version = "0.8.1" +version = "0.9.0" dependencies = [ "anstream", "anyhow", @@ -2916,7 +2916,7 @@ dependencies = [ [[package]] name = "prql-compiler-macros" -version = "0.8.1" +version = "0.9.0" dependencies = [ "prql-compiler", "syn 2.0.17", @@ -2924,7 +2924,7 @@ dependencies = [ [[package]] name = "prql-java" -version = "0.8.1" +version = "0.9.0" dependencies = [ "jni", "prql-compiler", @@ -2932,7 +2932,7 @@ dependencies = [ [[package]] name = "prql-js" -version = "0.8.1" +version = "0.9.0" dependencies = [ "console_error_panic_hook", "prql-compiler", @@ -2942,7 +2942,7 @@ dependencies = [ [[package]] name = "prql-lib" -version = "0.8.1" +version = "0.9.0" dependencies = [ "libc", "prql-compiler", @@ -2951,7 +2951,7 @@ dependencies = [ [[package]] name = "prql-python" -version = "0.8.1" +version = "0.9.0" dependencies = [ "insta", "prql-compiler", @@ -2961,7 +2961,7 @@ dependencies = [ [[package]] name = "prql_ast" -version = "0.0.0" +version = "0.9.0" dependencies = [ "enum-as-inner", "semver", @@ -2971,7 +2971,7 @@ dependencies = [ [[package]] name = "prql_parser" -version = "0.0.0" +version = "0.9.0" dependencies = [ "chumsky", "insta", @@ -2982,7 +2982,7 @@ dependencies = [ [[package]] name = "prqlc" -version = "0.8.1" +version = "0.9.0" dependencies = [ "anstream", "anyhow", diff --git a/Cargo.toml b/Cargo.toml index a2509959240c..af65b74be545 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,7 @@ edition = "2021" license = "Apache-2.0" repository = "https://github.com/PRQL/prql" rust-version = "1.65.0" -version = "0.8.1" +version = "0.9.0" [profile.release.package.prql-js] # Tell `rust-js` to optimize for small code size. diff --git a/bindings/prql-elixir/native/prql/Cargo.toml b/bindings/prql-elixir/native/prql/Cargo.toml index 32266f05bbfb..a65230de3c86 100644 --- a/bindings/prql-elixir/native/prql/Cargo.toml +++ b/bindings/prql-elixir/native/prql/Cargo.toml @@ -19,5 +19,5 @@ test = false # See Readme for details on Mac [target.'cfg(not(any(target_family="wasm", target_os = "macos", tarpaulin)))'.dependencies] -prql-compiler = {path = "../../../../crates/prql_compiler", default-features = false, version = "0.8.1"} +prql-compiler = {path = "../../../../crates/prql_compiler", default-features = false, version = "0.9.0" } rustler = "0.29.0" diff --git a/bindings/prql-js/package-lock.json b/bindings/prql-js/package-lock.json index f82b128a58ab..a726ad20377d 100644 --- a/bindings/prql-js/package-lock.json +++ b/bindings/prql-js/package-lock.json @@ -1,12 +1,12 @@ { "name": "prql-js", - "version": "0.8.1", + "version": "0.9.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "prql-js", - "version": "0.8.1", + "version": "0.9.0", "license": "Apache-2.0", "devDependencies": { "chai": "^4.3.6", diff --git a/bindings/prql-js/package.json b/bindings/prql-js/package.json index 4e34912acd6f..80bd86c332a0 100644 --- a/bindings/prql-js/package.json +++ b/bindings/prql-js/package.json @@ -25,5 +25,5 @@ "test": "mocha tests" }, "types": "dist/node/prql_js.d.ts", - "version": "0.8.1" + "version": "0.9.0" } diff --git a/crates/prql_ast/Cargo.toml b/crates/prql_ast/Cargo.toml index cad8bc5cb929..16b7bd4e147e 100644 --- a/crates/prql_ast/Cargo.toml +++ b/crates/prql_ast/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "prql_ast" -version = "0.0.0" +version = "0.9.0" publish = false edition.workspace = true diff --git a/crates/prql_compiler_macros/Cargo.toml b/crates/prql_compiler_macros/Cargo.toml index afb073a83e08..d8a1c7c63e80 100644 --- a/crates/prql_compiler_macros/Cargo.toml +++ b/crates/prql_compiler_macros/Cargo.toml @@ -14,7 +14,7 @@ proc_macro = true test = false [dependencies] -prql-compiler = {path = "../prql_compiler", default-features = false, version = "0.8.1" } +prql-compiler = {path = "../prql_compiler", default-features = false, version = "0.9.0" } syn = "2.0.2" [package.metadata.release] diff --git a/crates/prql_parser/Cargo.toml b/crates/prql_parser/Cargo.toml index b423bba53d81..3fa5c94128ff 100644 --- a/crates/prql_parser/Cargo.toml +++ b/crates/prql_parser/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "prql_parser" -version = "0.0.0" +version = "0.9.0" publish = false edition.workspace = true diff --git a/crates/prqlc/Cargo.toml b/crates/prqlc/Cargo.toml index 70eead55bae0..4d4ca78ddcd7 100644 --- a/crates/prqlc/Cargo.toml +++ b/crates/prqlc/Cargo.toml @@ -23,7 +23,7 @@ colorchoice-clap = "1.0.0" env_logger = {version = "0.10.0", features = ["color"]} itertools = "0.11.0" notify = "^6.0.0" -prql-compiler = {path = '../prql_compiler', version = "0.8.1", features = ["serde_yaml"]} +prql-compiler = {path = '../prql_compiler', version = "0.9.0", features = ["serde_yaml"]} regex = {version = "1.9.0", features = ["std", "unicode"]} serde = "^1" serde_json = "1.0.81" diff --git a/crates/tests_misc/Cargo.toml b/crates/tests_misc/Cargo.toml index bbcf066a22b6..a9f22802c82b 100644 --- a/crates/tests_misc/Cargo.toml +++ b/crates/tests_misc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "misc" -version = "0.0.0" +version = "0.9.0" edition = "2021" publish = false diff --git a/web/book/src/language-features/target.md b/web/book/src/language-features/target.md index 42b8f87f0d22..aa8c57f56d30 100644 --- a/web/book/src/language-features/target.md +++ b/web/book/src/language-features/target.md @@ -79,7 +79,7 @@ echo 'prql target:sql.generic PRQL allows specifying a version of the language in the PRQL header, like: ```prql -prql version:"0.8.1" +prql version:"0.9.0" from employees ``` diff --git a/web/playground/package-lock.json b/web/playground/package-lock.json index 4e014cfde9a9..4d4c032060f7 100644 --- a/web/playground/package-lock.json +++ b/web/playground/package-lock.json @@ -1,12 +1,12 @@ { "name": "prql-playground", - "version": "0.8.1", + "version": "0.9.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "prql-playground", - "version": "0.8.1", + "version": "0.9.0", "dependencies": { "@duckdb/duckdb-wasm": "^1.27.0", "@monaco-editor/react": "^4.5.0", @@ -27,7 +27,7 @@ } }, "../../bindings/prql-js": { - "version": "0.8.1", + "version": "0.9.0", "license": "Apache-2.0", "devDependencies": { "chai": "^4.3.6", diff --git a/web/playground/package.json b/web/playground/package.json index cd0b647bd656..4772f1738c82 100644 --- a/web/playground/package.json +++ b/web/playground/package.json @@ -44,5 +44,5 @@ "start": "react-scripts start", "test": "react-scripts test" }, - "version": "0.8.1" + "version": "0.9.0" } From a7e8232511abc399a02da96796bc6770bc9fced3 Mon Sep 17 00:00:00 2001 From: Maximilian Roos Date: Mon, 24 Jul 2023 22:09:02 -0700 Subject: [PATCH 2/2] --- crates/prqlc/src/cli.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crates/prqlc/src/cli.rs b/crates/prqlc/src/cli.rs index ed88a7294dd8..9b09355cb2b7 100644 --- a/crates/prqlc/src/cli.rs +++ b/crates/prqlc/src/cli.rs @@ -592,6 +592,7 @@ group a_column (take 10 | sort b_column | derive {the_number = rank, last = lag let result = Command::execute( &Command::SQLCompile { io_args: IoArgs::default(), + // FIXME: this doesn't seem to be working? hide_signature_comment: true, target: "sql.any".to_string(), }, @@ -618,7 +619,7 @@ group a_column (take 10 | sort b_column | derive {the_number = rank, last = lag FROM x - -- Generated by PRQL compiler version:0.8.1 (https://prql-lang.org) + -- Generated by PRQL compiler version:0.9.0 (https://prql-lang.org) "###); }