Skip to content
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions .github/workflows/test-rust.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,17 +56,14 @@ jobs:
args: ${{ inputs.target_option }} --no-run --locked
- name: Run docker compose
run: docker compose up -d
working-directory: ./prql-compiler/tests/integration-rdbms
working-directory: ./prql-compiler/tests/integration
if: ${{ inputs.os == 'ubuntu-latest' }}
- name: Wait for database
uses: ifaxity/wait-on-action@v1
with:
resource: "tcp:5432 tcp:3306 tcp:1433"
timeout: 60000
if: ${{ inputs.os == 'ubuntu-latest' }}
- name: skip integration if not linux
run: echo "SKIP_INTEGRATION=true" >> "$GITHUB_ENV"
if: ${{ inputs.os != 'ubuntu-latest' }}
# Only check unreferenced snapshots on the default target tests on ubuntu
#
# (Maybe there's a nicer approach where we can parameterize one step
Expand All @@ -79,7 +76,9 @@ jobs:
runner.os == 'Linux') }}
with:
command: insta
args: test --unreferenced=auto ${{ inputs.target_option }}
args:
test --unreferenced=auto ${{ inputs.target_option }} --features
Comment thread
Jelenkee marked this conversation as resolved.
Outdated
test-external-dbs
Comment thread
Jelenkee marked this conversation as resolved.
Outdated
- name: 📋 Test wasm
uses: richb-hanover/cargo@v1.1.0
if:
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/test-taskfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-taskfile
cancel-in-progress: true

env:
SKIP_INTEGRATION: true

jobs:
test-taskfile:
runs-on: macos-latest
Expand Down
11 changes: 7 additions & 4 deletions prql-compiler/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@ insta = {version = "1.29", features = ["colors", "glob", "yaml"]}
[target.'cfg(not(target_family="wasm"))'.dev-dependencies]
chrono = {version = "0.4", features = [], default-features = false}
criterion = "0.4.0"
postgres = "0.19.3"
pretty_assertions = "1.3.0"
rusqlite = {version = "0.29.0", features = ["bundled", "csvtab"]}
pg_bigdecimal = "0.1"
postgres = "0.19"
mysql = "23"
tiberius = {version = "0.12", features = ["sql-browser-tokio", "bigdecimal", "time"]}
tokio = {version = "1", features = ["full"]}
tokio-util = { version = "0.7", features = ["compat"] }
pretty_assertions = "1.3.0"
rusqlite = {version = "0.29.0", features = ["bundled", "csvtab"]}
pg_bigdecimal = "0.1"
csv = "1.2"

# Re-enable on windows when duckdb supports it
Expand All @@ -73,3 +73,6 @@ exactly = 1
file = "../web/book/src/language-features/target.md"
replace = 'prql version:"{{version}}"'
search = 'prql version:"[\d.]+"'

[features]
test-external-dbs = []
Comment thread
max-sixty marked this conversation as resolved.
46 changes: 0 additions & 46 deletions prql-compiler/tests/integration-rdbms/docker-compose.yml

This file was deleted.

182 changes: 0 additions & 182 deletions prql-compiler/tests/integration-rdbms/main.rs

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

5 changes: 2 additions & 3 deletions prql-compiler/tests/integration/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ Test PRQL queries against various SQL RDBMS.

## Data

Database chinook.db was downloaded from
<https://www.sqlitetutorial.net/sqlite-sample-database>

Columns are renamed to snake_case, so Postgres and DuckDb don't struggle with
them.

Expand Down Expand Up @@ -34,6 +31,8 @@ postgres server that should already have data loaded in.

This will not run as a part of `cargo test`, but can be run with docker-compose.

### TODO

Comment thread
Jelenkee marked this conversation as resolved.
Outdated
## Docker compose

There is also a proof on concept for testing done against Postgres, which can be
Expand Down
Binary file not shown.
Loading