Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
f9e9be6
Add ODBC support and update dependencies
cursoragent Sep 25, 2025
5ded901
Update sqlpage and sqlx dependencies, refactor database handling to u…
lovasoa Sep 25, 2025
2d256b0
fmt
lovasoa Sep 25, 2025
32fa503
Refactor database handling in tests to use database_type instead of a…
lovasoa Sep 25, 2025
c02cd94
Enhance Dockerfile and CI workflows by adding ODBC dependencies for i…
lovasoa Sep 25, 2025
90bb0bb
Add ODBC dependencies installation step in CI workflow for enhanced d…
lovasoa Sep 25, 2025
6355962
Enhance Dockerfile to include dependency copying for improved runtime…
lovasoa Sep 25, 2025
f4f3f66
Fix: Add arm64 and armhf architecture support for dependencies (#1025)
lovasoa Sep 25, 2025
7dcb369
install odbc on e2e ci
lovasoa Sep 25, 2025
c58e6c7
Update docker-compose and README for ODBC support; enhance CI workflo…
lovasoa Sep 25, 2025
ea155e1
Fix: Update ODBC driver and ensure /lib64 exists
cursoragent Sep 25, 2025
f8fd51e
undo stupid llm
lovasoa Sep 25, 2025
d0412e8
Refactor database connection handling to use AnyKind instead of Suppo…
lovasoa Sep 25, 2025
6bfcf90
Refactor database queries and connection handling to utilize DbInfo f…
lovasoa Sep 25, 2025
083738a
Refactor database handling to consistently use DbInfo and AnyKind acr…
lovasoa Sep 26, 2025
db0215f
clippy
lovasoa Sep 26, 2025
977866e
fix windows compilation
lovasoa Sep 26, 2025
507ae8d
clippy
lovasoa Sep 26, 2025
47d6605
Refactor SQL test file to derive database type from app state instead…
lovasoa Sep 26, 2025
55d7663
Update Dockerfile to remove unnecessary package installations for imp…
lovasoa Sep 26, 2025
caca20f
Update Dockerfiles to use Rust 1.90 for improved performance and comp…
lovasoa Sep 26, 2025
eadd2af
fix Dockerfile: include additional libraries
lovasoa Sep 26, 2025
022f925
add example odbc conn string to readme
lovasoa Sep 26, 2025
8ae8690
Update README to include additional ODBC-compatible databases: ClickH…
lovasoa Sep 26, 2025
75bedf3
fix Dockerfile: update library paths for arm architecture
lovasoa Sep 26, 2025
349d1a0
fix Dockerfile: streamline library installation and update paths for …
lovasoa Sep 26, 2025
081676b
fix Dockerfile: enhance cross-compilation setup by adding clang and u…
lovasoa Sep 26, 2025
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
36 changes: 31 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ jobs:
- uses: actions/checkout@v4
- run: npm ci
- run: npm test
- name: Install ODBC dependencies
run: |
sudo apt-get update
sudo apt-get install -y unixodbc-dev freetds-dev
- name: Set up cargo cache
uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
- run: cargo fmt --all -- --check
Expand All @@ -42,21 +46,43 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
database: ["postgres", "mysql", "mssql"]
include:
- database: postgres
container: postgres
db_url: "postgres://root:[email protected]/sqlpage"
- database: mysql
container: mysql
db_url: "mysql://root:[email protected]/sqlpage"
- database: mssql
container: mssql
db_url: "mssql://root:[email protected]/sqlpage"
- database: odbc
container: postgres
db_url: "Driver={PostgreSQL Unicode};Server=127.0.0.1;Port=5432;Database=sqlpage;UID=root;PWD=Password123!"
setup_odbc: true
steps:
- uses: actions/checkout@v4
- name: Set up cargo cache
uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
- name: Install ODBC dependencies
run: |
sudo apt-get update
sudo apt-get install -y unixodbc-dev freetds-dev
- name: Setup ODBC for testing
if: matrix.setup_odbc
run: |
# Install PostgreSQL ODBC driver (automatically registers the driver)
sudo apt-get install -y odbc-postgresql
- name: Start database container
run: docker compose up --wait ${{ matrix.database }}
run: docker compose up --wait ${{ matrix.container }}
- name: Show container logs
if: failure()
run: docker compose logs ${{ matrix.database }}
run: docker compose logs ${{ matrix.container }}
- name: Run tests against ${{ matrix.database }}
timeout-minutes: 5
run: cargo test
env:
DATABASE_URL: ${{ matrix.database }}://root:[email protected]/sqlpage
DATABASE_URL: ${{ matrix.db_url }}
RUST_BACKTRACE: 1
RUST_LOG: sqlpage=debug

Expand All @@ -73,7 +99,7 @@ jobs:
RUST_BACKTRACE: 1
- name: Upload Windows binary
uses: actions/upload-artifact@v4
with:
with:
name: sqlpage-windows-debug
path: "target/debug/sqlpage.exe"

Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/playwright.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,8 @@ jobs:
node-version: lts/*
cache: 'npm'
cache-dependency-path: ./tests/end-to-end/package-lock.json
- name: Install dependencies
run: |
npm ci
npx playwright install --with-deps chromium
- run: sudo apt-get update && sudo apt-get install -y unixodbc-dev
- run: npm ci && npx playwright install --with-deps chromium
- name: build sqlpage
run: cargo build
working-directory: ./examples/official-site
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,10 @@ jobs:
container: quay.io/pypa/manylinux_2_28_x86_64
steps:
- uses: actions/checkout@v4
- name: Install ODBC dependencies
run: |
yum update -y
yum install -y unixODBC-devel freetds-devel
- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@stable
with:
Expand Down
Loading
Loading