Skip to content
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.

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

WIP: create sqlx.toml format #3383

Draft
wants to merge 32 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
afa3a93
feat: create `sqlx.toml` format
abonander Jul 26, 2024
062a06f
feat: add support for ignored_chars config to sqlx_core::migrate
abonander Sep 9, 2024
9f34fc8
chore: test ignored_chars with `U+FEFF` (ZWNBSP/BOM)
abonander Sep 9, 2024
e775d2a
refactor: make `Config` always compiled
abonander Sep 18, 2024
bf90a47
refactor: add origin information to `Column`
abonander Sep 18, 2024
5cb3de3
feat(macros): implement `type_override` and `column_override` from `s…
abonander Sep 19, 2024
8604b51
refactor(sqlx.toml): make all keys kebab-case, create `macros.preferr…
abonander Sep 20, 2024
13f6ef0
feat: make macros aware of `macros.preferred-crates`
abonander Sep 20, 2024
65ef27f
feat: make `sqlx-cli` aware of `database-url-var`
abonander Sep 20, 2024
9d1bc64
feat: teach macros about `migrate.table-name`, `migrations-dir`
abonander Sep 23, 2024
ba7740d
feat: teach macros about `migrate.ignored-chars`
abonander Sep 23, 2024
e951d8e
chore: delete unused source file `sqlx-cli/src/migration.rs`
abonander Oct 5, 2024
367f2cc
feat: teach `sqlx-cli` about `migrate.defaults`
abonander Oct 5, 2024
1ff6a8a
feat: teach `sqlx-cli` about `migrate.migrations-dir`
abonander Jan 15, 2025
45c0b85
feat: teach `sqlx-cli` about `migrate.table-name`
abonander Jan 22, 2025
3765f67
feat: introduce `migrate.create-schemas`
abonander Jan 22, 2025
017ffce
Merge branch 'main' into sqlx-toml
abonander Jan 22, 2025
28b6450
WIP feat: create multi-tenant database example
abonander Jan 26, 2025
7d646a9
fix(postgres): don't fetch `ColumnOrigin` for transparently-prepared …
abonander Feb 2, 2025
c2b9f87
feat: progress on axum-multi-tenant example
abonander Feb 2, 2025
d9fc489
feat(config): better errors for mislabeled fields
abonander Feb 21, 2025
0b79b51
WIP feat: filling out axum-multi-tenant example
abonander Feb 26, 2025
46878e8
feat: multi-tenant example
abonander Feb 28, 2025
1b0c64a
chore(ci): test multi-tenant example
abonander Feb 28, 2025
8429f2e
Merge remote-tracking branch 'origin/main' into sqlx-toml
abonander Feb 28, 2025
f4d22fb
fixup after merge
abonander Feb 28, 2025
15df159
fix(ci): enable `sqlx-toml` in CLI build for examples
abonander Feb 28, 2025
4fb7102
fix: CI, README for `multi-tenant`
abonander Feb 28, 2025
2b69150
fix: clippy warnings
abonander Feb 28, 2025
a9a4d00
fix: multi-tenant README
abonander Feb 28, 2025
ac7f270
fix: sequential versioning inference for migrations
abonander Feb 28, 2025
8ddcd06
fix: migration versioning with explicit overrides
abonander Feb 28, 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
28 changes: 21 additions & 7 deletions .github/workflows/examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ jobs:
key: sqlx-cli

- run: >
cargo build
-p sqlx-cli
--bin sqlx
--release
--no-default-features
--features mysql,postgres,sqlite
cargo build
-p sqlx-cli
--bin sqlx
--release
--no-default-features
--features mysql,postgres,sqlite,sqlx-toml

- uses: actions/upload-artifact@v4
with:
Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
name: sqlx-cli
path: /home/runner/.local/bin

- run: |
- run: |
ls -R /home/runner/.local/bin
chmod +x $HOME/.local/bin/sqlx
echo $HOME/.local/bin >> $GITHUB_PATH
Expand Down Expand Up @@ -175,6 +175,20 @@ jobs:
DATABASE_URL: postgres://postgres:password@localhost:5432/mockable-todos
run: cargo run -p sqlx-example-postgres-mockable-todos

- name: Multi-Tenant (Setup)
working-directory: examples/postgres/multi-tenant
env:
DATABASE_URL: postgres://postgres:password@localhost:5432/multi-tenant
run: |
(cd accounts && sqlx db setup)
(cd payments && sqlx migrate run)
sqlx migrate run

- name: Multi-Tenant (Run)
env:
DATABASE_URL: postgres://postgres:password@localhost:5432/multi-tenant
run: cargo run -p sqlx-example-postgres-multi-tenant

- name: TODOs (Setup)
working-directory: examples/postgres/todos
env:
Expand Down
Loading
Loading