Skip to content
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,18 @@ concurrency:

env:
CARGO_TERM_COLOR: always
HURL_VERSION: 8.0.0
HURL_VERSION: 8.0.1
REGISTRY_USERNAME: lovasoa
REGISTRY_IMAGE: lovasoa/sqlpage

jobs:
compile_and_lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
- uses: actions/setup-node@v6
- uses: actions/checkout@v7
- uses: actions/setup-node@v7
with:
node-version: 24
node-version: 26
cache: 'npm'
- run: npm ci
- run: npm test
Expand Down Expand Up @@ -104,7 +104,7 @@ jobs:
container: oracle
db_url: "Driver=Oracle 21 ODBC driver;Dbq=//127.0.0.1:1521/FREEPDB1;Uid=root;Pwd=Password123!"
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7
# Reuse the exact Linux test harnesses produced by compile_and_lint.
# This keeps the DB matrix focused on database behavior instead of
# compiling the same Rust crate five more times.
Expand Down Expand Up @@ -160,13 +160,13 @@ jobs:
windows_test:
runs-on: windows-latest
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7
- name: Set up cargo cache
uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4
env:
NODE_OPTIONS: --no-deprecation
- name: Set up Windows incremental cache
uses: actions/cache@v5
uses: actions/cache@v6
with:
path: |
target/debug/.fingerprint/sqlpage-*
Expand Down Expand Up @@ -196,10 +196,10 @@ jobs:
run:
working-directory: ./tests/end-to-end
steps:
- uses: actions/checkout@v6
- uses: actions/setup-node@v6
- uses: actions/checkout@v7
- uses: actions/setup-node@v7
with:
node-version: 24
node-version: 26
cache: 'npm'
cache-dependency-path: ./package-lock.json
- run: sudo apt-get update && sudo apt-get install -y unixodbc-dev
Expand Down Expand Up @@ -252,7 +252,7 @@ jobs:
tag_suffix: -linux-arm64-duckdb
steps:
- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@v7
- id: cache-scope
name: Docker cache scope
run: |
Expand Down Expand Up @@ -322,7 +322,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@v7
- name: Docker meta
id: meta
uses: docker/metadata-action@v6
Expand Down Expand Up @@ -419,14 +419,14 @@ jobs:
outputs:
examples: ${{ steps.examples.outputs.examples }}
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7
- id: examples
run: |
examples="$(find examples -mindepth 2 -maxdepth 2 -name test.hurl -print | sed 's#/test.hurl$##' | sort | jq -R -s -c 'split("\n")[:-1]')"
echo "examples=$examples" >> "$GITHUB_OUTPUT"
- name: Restore Hurl archive
id: hurl-cache
uses: actions/cache@v5
uses: actions/cache@v6
with:
path: .cache/hurl
key: hurl-${{ runner.os }}-x86_64-unknown-linux-gnu-${{ env.HURL_VERSION }}
Expand Down Expand Up @@ -465,7 +465,7 @@ jobs:
matrix:
example: ${{ fromJSON(needs.hurl_examples.outputs.examples) }}
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7
- name: Download Hurl archive
uses: actions/download-artifact@v8
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/official-site.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Cloning repo
uses: actions/checkout@v6
uses: actions/checkout@v7
with:
fetch-depth: 0
- id: get_gitsha
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
target: x86_64-apple-darwin
features: "odbc-static"
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7
- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@stable
with:
Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:
runs-on: ubuntu-latest
container: quay.io/pypa/manylinux_2_28_x86_64
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7
- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@stable
with:
Expand All @@ -107,7 +107,7 @@ jobs:
name: Build AWS Lambda Serverless zip image
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7
- run: docker build -t sqlpage-lambda . -f lambda.Dockerfile --target runner
- run: docker build -t sqlpage-lambda-builder . -f lambda.Dockerfile --target builder
- run: docker run sqlpage-lambda-builder cat deploy.zip > sqlpage-aws-lambda.zip
Expand All @@ -122,7 +122,7 @@ jobs:
runs-on: ubuntu-latest
if: startsWith(github.ref, 'refs/tags/')
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7
- uses: actions/download-artifact@v8
env:
NODE_OPTIONS: --no-deprecation
Expand Down Expand Up @@ -154,7 +154,7 @@ jobs:
runs-on: ubuntu-latest
if: startsWith(github.ref, 'refs/tags/')
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7
- name: Set up cargo cache
uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4
env:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
- Tooltip title text is now inhertis the same colour as the tooltip text.
- Charts can display reference lines. A row with a `yline` is drawn as a line across the chart at that value of the y axis, and a row with an `xline` marks a position on the x axis. Adding `yline_end` or `xline_end` makes a line a band, and the row's `label` and `color` set its text and its color. Reference lines are rows, so a chart can have as many of them as the query returns. Each one follows its own axis, so on a `horizontal` bar chart a `yline` is drawn down the chart rather than across it. They are not added to the total of a `stacked` chart, and are not filled in an `area` chart.
- Chart data rows can set their own `color`, painting a single bar, slice or point instead of the whole series. It applies to `bar`, `column`, `rangeBar`, `pie`, `treemap`, `scatter` and `bubble` charts, and to the markers of a `line` or an `area` chart.
- Updated the bundled Tabler icon sprite from v3.44.0 to [v3.46.0](https://github.com/tabler/tabler-icons/releases/tag/v3.46.0). This adds 18 icons, including `play-bug`, `remote-control`, `rocking-chair`, `run-sprint`, `tabs`, `treasure-chest`, `vault`, and `yarn`, and includes the upstream fixes listed in the release notes.
- Recursive `sqlpage.run_sql` errors now show one concise, positioned error instead of repeating the full inclusion chain.

## v0.45
Expand Down
2 changes: 1 addition & 1 deletion build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ async fn main() {
spawn(download_deps(c.clone(), "sqlpage.css")),
spawn(download_tabler_icons(
c.clone(),
"https://cdn.jsdelivr.net/npm/@tabler/icons-sprite@3.44.0/dist/tabler-sprite.svg",
"https://cdn.jsdelivr.net/npm/@tabler/icons-sprite@3.46.0/dist/tabler-sprite.svg",
)),
spawn(download_deps(c.clone(), "apexcharts.js")),
spawn(download_deps(c.clone(), "tomselect.js")),
Expand Down
2 changes: 1 addition & 1 deletion examples/sending emails/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ services:
- mailpit

mailpit:
image: axllent/mailpit:v1.30.4
image: axllent/mailpit:v1.31.0
ports:
- "8025:8025"
4 changes: 2 additions & 2 deletions examples/single sign on/keycloak.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM keycloak/keycloak:26.6.2
FROM keycloak/keycloak:26.7.2

ADD --chown=1000:0 https://github.com/jacekkow/keycloak-protocol-cas/releases/download/26.6.2/keycloak-protocol-cas-26.6.2.jar \
ADD --chown=1000:0 https://github.com/jacekkow/keycloak-protocol-cas/releases/download/26.7.2/keycloak-protocol-cas-26.7.2.jar \
/opt/keycloak/providers/keycloak-protocol-cas.jar

COPY ./keycloak-configuration.json /opt/keycloak/data/import/realm.json
Expand Down
4 changes: 2 additions & 2 deletions examples/telemetry/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ services:
condition: service_started

prometheus:
image: prom/prometheus:v3.2.1
image: prom/prometheus:v3.14.0
command:
- --config.file=/etc/prometheus/prometheus.yml
- --storage.tsdb.path=/prometheus
Expand All @@ -141,7 +141,7 @@ services:
command: ["-config.file=/etc/tempo/config.yaml"]

loki:
image: grafana/loki:3.7.2
image: grafana/loki:3.7.7
command: ["-config.file=/etc/loki/local-config.yaml"]

grafana:
Expand Down
Loading