Skip to content

Commit af84d75

Browse files
committed
Merge branch 'main' of https://github.com/PookieBuns/sqlmodel into async
2 parents b5e850b + d05c3ee commit af84d75

File tree

132 files changed

+2814
-2435
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+2814
-2435
lines changed

Diff for: .github/actions/comment-docs-preview-in-pr/app/main.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,7 @@ class PartialGithubEvent(BaseModel):
4848
use_pr = pr
4949
break
5050
if not use_pr:
51-
logging.error(
52-
f"No PR found for hash: {event.workflow_run.head_commit.id}"
53-
)
51+
logging.error(f"No PR found for hash: {event.workflow_run.head_commit.id}")
5452
sys.exit(0)
5553
github_headers = {
5654
"Authorization": f"token {settings.input_token.get_secret_value()}"

Diff for: .github/workflows/build-docs.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
outputs:
1818
docs: ${{ steps.filter.outputs.docs }}
1919
steps:
20-
- uses: actions/checkout@v3
20+
- uses: actions/checkout@v4
2121
# For pull requests it's not necessary to checkout the code but for the main branch it is
2222
- uses: dorny/paths-filter@v2
2323
id: filter
@@ -41,7 +41,7 @@ jobs:
4141
env:
4242
GITHUB_CONTEXT: ${{ toJson(github) }}
4343
run: echo "$GITHUB_CONTEXT"
44-
- uses: actions/checkout@v3
44+
- uses: actions/checkout@v4
4545
- name: Set up Python
4646
uses: actions/setup-python@v4
4747
with:

Diff for: .github/workflows/deploy-docs.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ jobs:
1414
env:
1515
GITHUB_CONTEXT: ${{ toJson(github) }}
1616
run: echo "$GITHUB_CONTEXT"
17-
- uses: actions/checkout@v3
17+
- uses: actions/checkout@v4
1818
- name: Clean site
1919
run: |
2020
rm -rf ./site
2121
mkdir ./site
2222
- name: Download Artifact Docs
2323
id: download
24-
uses: dawidd6/action-download-artifact@v2.27.0
24+
uses: dawidd6/action-download-artifact@v2.28.0
2525
with:
2626
if_no_artifact_found: ignore
2727
github_token: ${{ secrets.GITHUB_TOKEN }}

Diff for: .github/workflows/latest-changes.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
latest-changes:
2121
runs-on: ubuntu-latest
2222
steps:
23-
- uses: actions/checkout@v3
23+
- uses: actions/checkout@v4
2424
with:
2525
# To allow latest-changes to commit to the main branch
2626
token: ${{ secrets.SQLMODEL_LATEST_CHANGES }}

Diff for: .github/workflows/publish.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
publish:
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
1919
- name: Set up Python
2020
uses: actions/setup-python@v4
2121
with:

Diff for: .github/workflows/smokeshow.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
- run: pip install smokeshow
2222

23-
- uses: dawidd6/action-download-artifact@v2.24.2
23+
- uses: dawidd6/action-download-artifact@v2.28.0
2424
with:
2525
workflow: test.yml
2626
commit: ${{ github.event.workflow_run.head_sha }}

Diff for: .github/workflows/test.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
fail-fast: false
2929

3030
steps:
31-
- uses: actions/checkout@v3
31+
- uses: actions/checkout@v4
3232
- name: Set up Python
3333
uses: actions/setup-python@v4
3434
with:
@@ -74,7 +74,7 @@ jobs:
7474
runs-on: ubuntu-latest
7575

7676
steps:
77-
- uses: actions/checkout@v3
77+
- uses: actions/checkout@v4
7878

7979
- uses: actions/setup-python@v4
8080
with:

Diff for: .pre-commit-config.yaml

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# See https://pre-commit.com for more information
2+
# See https://pre-commit.com/hooks.html for more hooks
3+
default_language_version:
4+
python: python3.10
5+
repos:
6+
- repo: https://github.com/pre-commit/pre-commit-hooks
7+
rev: v4.5.0
8+
hooks:
9+
- id: check-added-large-files
10+
- id: check-toml
11+
- id: check-yaml
12+
args:
13+
- --unsafe
14+
- id: end-of-file-fixer
15+
- id: trailing-whitespace
16+
- repo: https://github.com/asottile/pyupgrade
17+
rev: v3.15.0
18+
hooks:
19+
- id: pyupgrade
20+
args:
21+
- --py3-plus
22+
- --keep-runtime-typing
23+
- repo: https://github.com/astral-sh/ruff-pre-commit
24+
rev: v0.1.1
25+
hooks:
26+
- id: ruff
27+
args:
28+
- --fix
29+
- repo: https://github.com/psf/black
30+
rev: 23.10.0
31+
hooks:
32+
- id: black
33+
ci:
34+
autofix_commit_msg: 🎨 [pre-commit.ci] Auto format from pre-commit.com hooks
35+
autoupdate_commit_msg: ⬆ [pre-commit.ci] pre-commit autoupdate

Diff for: CITATION.cff

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# This CITATION.cff file was generated with cffinit.
2+
# Visit https://bit.ly/cffinit to generate yours today!
3+
4+
cff-version: 1.2.0
5+
title: SQLModel
6+
message: >-
7+
If you use this software, please cite it using the
8+
metadata from this file.
9+
type: software
10+
authors:
11+
- given-names: Sebastián
12+
family-names: Ramírez
13+
14+
identifiers:
15+
repository-code: 'https://github.com/tiangolo/sqlmodel'
16+
url: 'https://sqlmodel.tiangolo.com'
17+
abstract: >-
18+
SQLModel, SQL databases in Python, designed for
19+
simplicity, compatibility, and robustness.
20+
keywords:
21+
- fastapi
22+
- pydantic
23+
- sqlalchemy
24+
license: MIT

Diff for: README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ It combines SQLAlchemy and Pydantic and tries to simplify the code you write as
5050

5151
## Requirements
5252

53-
A recent and currently supported <a href="https://www.python.org/downloads/" class="external-link" target="_blank">version of Python Python</a>.
53+
A recent and currently supported <a href="https://www.python.org/downloads/" class="external-link" target="_blank">version of Python</a>.
5454

5555
As **SQLModel** is based on **Pydantic** and **SQLAlchemy**, it requires them. They will be automatically installed when you install SQLModel.
5656

Diff for: docs/contributing.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ There is a script that you can run locally to test all the code and generate cov
112112
<div class="termy">
113113

114114
```console
115-
$ bash scripts/test-cov-html.sh
115+
$ bash scripts/test.sh
116116
```
117117

118118
</div>

Diff for: docs/db-to-code.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ DROP TABLE hero;
111111

112112
That is how you tell the database in SQL to delete the entire table `hero`.
113113

114-
<a href="http://www.nooooooooooooooo.com/" class="external-link" target="_blank">Nooooo!</a> We lost all the data in the `hero` table! 💥😱
114+
<a href="https://theuselessweb.site/nooooooooooooooo/" class="external-link" target="_blank">Nooooo!</a> We lost all the data in the `hero` table! 💥😱
115115

116116
### SQL Sanitization
117117

@@ -305,4 +305,4 @@ You will see **your own code** a lot more than the internal table names, so it's
305305
So, to keep things consistent, I'll keep using the same table names that **SQLModel** would have generated.
306306

307307
!!! tip
308-
You can also override the table name. You can read about it in the Advanced User Guide.
308+
You can also override the table name. You can read about it in the Advanced User Guide.

Diff for: docs/img/databases/external-server.drawio

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,4 +90,4 @@
9090
</root>
9191
</mxGraphModel>
9292
</diagram>
93-
</mxfile>
93+
</mxfile>

Diff for: docs/img/databases/external-server.svg

+1-1
Loading

Diff for: docs/img/databases/multiple-servers.drawio

+1-1
Original file line numberDiff line numberDiff line change
@@ -202,4 +202,4 @@
202202
</root>
203203
</mxGraphModel>
204204
</diagram>
205-
</mxfile>
205+
</mxfile>

Diff for: docs/img/databases/multiple-servers.svg

+1-1
Loading

Diff for: docs/img/databases/relationships.drawio

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,4 +148,4 @@
148148
</root>
149149
</mxGraphModel>
150150
</diagram>
151-
</mxfile>
151+
</mxfile>

Diff for: docs/img/databases/relationships.svg

+1-1
Loading

Diff for: docs/img/databases/same-server.drawio

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,4 +81,4 @@
8181
</root>
8282
</mxGraphModel>
8383
</diagram>
84-
</mxfile>
84+
</mxfile>

0 commit comments

Comments
 (0)