Skip to content

merge main into branch #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Sep 24, 2025
Merged

merge main into branch #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
4566df7
sqlx-postgres(tests): cleanup 2 unit tests. (#4002)
joeydewaal Aug 27, 2025
5d4e1a4
chore(deps): Set default-features=false on sqlx in workspace.dependen…
iamjpotts Aug 27, 2025
c5037f1
chore(deps): Resolve deprecation warning for chrono Date and ymd meth…
iamjpotts Aug 27, 2025
e6e8fc7
use random ports for all conatiners (#4007)
papaj-na-wrotkach Aug 27, 2025
3abb186
make `#[derive(sqlx::Type)]` automatically generate `impl PgHasArrayT…
papaj-na-wrotkach Aug 28, 2025
69bb595
Drop cached db connections in macros upon hitting an error (#4009)
swlynch99 Aug 29, 2025
482c942
PostgreSQL SASL – run SHA256 in a blocking executor (#4006)
ThomWright Sep 6, 2025
6b828e6
Smol+async global executor 1.80 dev (#3791)
martin-kolarik Sep 8, 2025
500cd18
Add `Migrator::with_migrations()` constructor (#4020)
xb284524239 Sep 8, 2025
66526d9
refactor: tweaks after #3791 (#4022)
abonander Sep 8, 2025
1f4b5f2
feat(sqlite): `no_tx` migration support (#4015)
AlexTMjugador Sep 8, 2025
54a0492
refactor(any): Remove lifetime parameter from AnyArguments (#3958)
iamjpotts Sep 12, 2025
8152689
refactor(core): Remove lifetime parameter from Arguments trait (#3960)
iamjpotts Sep 14, 2025
c52e129
fix(sqlite) Migrate revert with no-transaction (#4024)
Dosenpfand Sep 15, 2025
064d649
native tls handshake: build TlsConnector in blocking threadpool (#4027)
daviduebler Sep 23, 2025
c08603e
Merge branch 'feat/json-any' into dev-merge
JosiahParry Sep 24, 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
21 changes: 11 additions & 10 deletions .github/workflows/sqlx.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ jobs:
runs-on: ubuntu-24.04
strategy:
matrix:
runtime: [ async-std, tokio ]
# Note: because `async-std` is deprecated, we only check it in a single job to save CI time.
runtime: [ async-std, async-global-executor, smol, tokio ]
tls: [ native-tls, rustls, none ]
timeout-minutes: 30
steps:
Expand Down Expand Up @@ -122,7 +123,7 @@ jobs:
runs-on: ubuntu-24.04
strategy:
matrix:
runtime: [ async-std, tokio ]
runtime: [ async-global-executor, smol, tokio ]
linking: [ sqlite, sqlite-unbundled ]
needs: check
timeout-minutes: 30
Expand Down Expand Up @@ -208,7 +209,7 @@ jobs:
strategy:
matrix:
postgres: [ 17, 13 ]
runtime: [ async-std, tokio ]
runtime: [ async-global-executor, smol, tokio ]
tls: [ native-tls, rustls-aws-lc-rs, rustls-ring, none ]
needs: check
timeout-minutes: 30
Expand Down Expand Up @@ -243,7 +244,7 @@ jobs:
env:
DATABASE_URL: postgres://postgres:password@localhost:5432/sqlx
SQLX_OFFLINE_DIR: .sqlx
RUSTFLAGS: --cfg postgres="${{ matrix.postgres }}"
RUSTFLAGS: -D warnings --cfg postgres="${{ matrix.postgres }}"

# Run the `test-attr` test again to cover cleanup.
- run: >
Expand All @@ -254,7 +255,7 @@ jobs:
env:
DATABASE_URL: postgres://postgres:password@localhost:5432/sqlx
SQLX_OFFLINE_DIR: .sqlx
RUSTFLAGS: --cfg postgres="${{ matrix.postgres }}"
RUSTFLAGS: -D warnings --cfg postgres="${{ matrix.postgres }}"

- if: matrix.tls != 'none'
run: >
Expand All @@ -264,7 +265,7 @@ jobs:
env:
DATABASE_URL: postgres://postgres:password@localhost:5432/sqlx?sslmode=verify-ca&sslrootcert=.%2Ftests%2Fcerts%2Fca.crt
SQLX_OFFLINE_DIR: .sqlx
RUSTFLAGS: --cfg postgres="${{ matrix.postgres }}"
RUSTFLAGS: -D warnings --cfg postgres="${{ matrix.postgres }}"

# Remove test artifacts
- run: cargo clean -p sqlx
Expand All @@ -290,7 +291,7 @@ jobs:
DATABASE_URL: postgres://postgres:password@localhost:5432/sqlx
SQLX_OFFLINE: true
SQLX_OFFLINE_DIR: .sqlx
RUSTFLAGS: --cfg postgres="${{ matrix.postgres }}"
RUSTFLAGS: -D warnings --cfg postgres="${{ matrix.postgres }}"

postgres-ssl-auth:
name: Postgres SSL Auth
Expand Down Expand Up @@ -322,15 +323,15 @@ jobs:
--features any,postgres,macros,_unstable-all-types,runtime-${{ matrix.runtime }},tls-${{ matrix.tls }}
env:
DATABASE_URL: postgres://postgres@localhost:5432/sqlx?sslmode=verify-ca&sslrootcert=.%2Ftests%2Fcerts%2Fca.crt&sslkey=.%2Ftests%2Fcerts%2Fkeys%2Fclient.key&sslcert=.%2Ftests%2Fcerts%2Fclient.crt
RUSTFLAGS: --cfg postgres="${{ matrix.postgres }}"
RUSTFLAGS: -D warnings --cfg postgres="${{ matrix.postgres }}"

mysql:
name: MySQL
runs-on: ubuntu-24.04
strategy:
matrix:
mysql: [ 8 ]
runtime: [ async-std, tokio ]
runtime: [ async-global-executor, smol, tokio ]
tls: [ native-tls, rustls-aws-lc-rs, rustls-ring, none ]
needs: check
timeout-minutes: 30
Expand Down Expand Up @@ -431,7 +432,7 @@ jobs:
strategy:
matrix:
mariadb: [ verylatest, 11_8, 11_4, 10_11, 10_6 ]
runtime: [ async-std, tokio ]
runtime: [ async-global-executor, smol, tokio ]
tls: [ native-tls, rustls-aws-lc-rs, rustls-ring, none ]
needs: check
timeout-minutes: 30
Expand Down
Loading