Skip to content

Commit 870dc4c

Browse files
authored
Merge branch 'fastapi:main' into docs/aliases
2 parents d5f78f2 + 55abec9 commit 870dc4c

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ repos:
1414
- id: end-of-file-fixer
1515
- id: trailing-whitespace
1616
- repo: https://github.com/astral-sh/ruff-pre-commit
17-
rev: v0.12.9
17+
rev: v0.12.10
1818
hooks:
1919
- id: ruff
2020
args:

docs/release-notes.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
### Docs
1010

11+
* ✏️ Fix typos in `docs/tutorial/relationship-attributes/cascade-delete-relationships.md`. PR [#1543](https://github.com/fastapi/sqlmodel/pull/1543) by [@YuriiMotov](https://github.com/YuriiMotov).
1112
* 🍱 Update SVG files, a single file per diagram, sans-serif fonts. PR [#1373](https://github.com/fastapi/sqlmodel/pull/1373) by [@tiangolo](https://github.com/tiangolo).
1213
* 📝 Grammar tweak in `docs/tutorial/insert.md`. PR [#1368](https://github.com/fastapi/sqlmodel/pull/1368) by [@brettcannon](https://github.com/brettcannon).
1314
* 📝 Update `docs/tutorial/fastapi/relationships.md`. PR [#1365](https://github.com/fastapi/sqlmodel/pull/1365) by [@Foxerine](https://github.com/Foxerine).
@@ -19,6 +20,8 @@
1920

2021
### Internal
2122

23+
* ⬆ Bump ruff from 0.12.9 to 0.12.10. PR [#1532](https://github.com/fastapi/sqlmodel/pull/1532) by [@dependabot[bot]](https://github.com/apps/dependabot).
24+
*[pre-commit.ci] pre-commit autoupdate. PR [#1534](https://github.com/fastapi/sqlmodel/pull/1534) by [@pre-commit-ci[bot]](https://github.com/apps/pre-commit-ci).
2225
* ⬆ Bump typer from 0.16.0 to 0.16.1. PR [#1531](https://github.com/fastapi/sqlmodel/pull/1531) by [@dependabot[bot]](https://github.com/apps/dependabot).
2326
* ⬆ Bump actions/download-artifact from 4 to 5. PR [#1451](https://github.com/fastapi/sqlmodel/pull/1451) by [@dependabot[bot]](https://github.com/apps/dependabot).
2427
* ⬆ Bump actions/checkout from 4 to 5. PR [#1488](https://github.com/fastapi/sqlmodel/pull/1488) by [@dependabot[bot]](https://github.com/apps/dependabot).

docs/tutorial/relationship-attributes/cascade-delete-relationships.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ For example, **SQLite** doesn't support them by default. They have to be manuall
185185
PRAGMA foreign_keys = ON;
186186
```
187187

188-
So, in general is a good idea to have both `cascade_delete` and `ondelete` configured.
188+
So, in general it's a good idea to have both `cascade_delete` and `ondelete` configured.
189189

190190
/// tip
191191

@@ -203,7 +203,7 @@ Just a note to remember... 🤓
203203
class Hero(SQLModel, table=True):
204204
...
205205

206-
team_id: int Field(foreign_key="team.id", ondelete="CASCADE")
206+
team_id: int = Field(foreign_key="team.id", ondelete="CASCADE")
207207
```
208208

209209
* `cascade_delete` is put on the `Relationship()`. Normally on the **"one"** side in "one-to-many" relationships, the side **without a foreign key**.
@@ -348,7 +348,7 @@ The result would be these tables.
348348

349349
| id | name | secret_name | age | team_id |
350350
| ---- | --------------- | ---------------- | ---- | ------- |
351-
| 1 | Deadpond | Dive WIlson | | 1 |
351+
| 1 | Deadpond | Dive Wilson | | 1 |
352352
| 2 | Rusty-Man | Tommy Sharp | 48 | 2 |
353353
| 3 | Spider-Boy | Pedro Parqueador | | 2 |
354354
| 4 | Black Lion | Trevor Challa | 35 | NULL |

requirements-tests.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
pytest >=7.0.1,<9.0.0
44
coverage[toml] >=6.2,<8.0
55
mypy ==1.4.1
6-
ruff ==0.12.9
6+
ruff ==0.12.10
77
# For FastAPI tests
88
fastapi >=0.103.2
99
httpx ==0.28.1

0 commit comments

Comments
 (0)