✨ Upgrade SQLAlchemy to 2.0, including initial work by farahats9 by tiangolo · Pull Request #700 · fastapi/sqlmodel

tiangolo · 2023-11-18T10:20:09Z

✨ Upgrade SQLAlchemy to 2.0, including initial work by @farahats9

This includes @farahats9 commits from #563 and builds on top.

I reverted a few things, e.g. altering the docs to workaround for a previous lack of support for forward references.
Added support/fix for forward reference errors.
Removed several sections/modules that are no longer necessary, as were mainly to add type annotations to SQLAlchemy things, but now with SQLAlchemy's new proper types that's no longer necessary and I can reuse SQLAlchemy's things directly.
Updated all needed tests, e.g. to support the latest FastAPI.
Updated all the generated selects to use the new SQLAlchemy types.
Updated the classes and type annotations with the new SQLAlchemy types, with some overloads to make sure they are compatible with SQLModel. E.g. select().where().
Redefine all functions that would take column operations to accept the types used by SQLModel, e.g. or_(Hero.name == "Deadpond") as SQLAlchemy's version would require Hero.name to be a Mapped[str] instead of a str.
I explored a lot if it was possible/sensible to use and encourage the new Mapped[X], but sadly that breaks type annotations for creating new instances and dataclass_transform, as then that would expect to receive values with Mapped[X], e.g. Mapped[str] instead of str. And it would also add complications to the Pydantic handling. So, this was a lot of work mostly exploratory, but not much ended in the PR.

Co-authored-by: Stefan Borer <stefan.borer@gmail.com>

Fix most linting errors

…pes, now beautifully defined in SQLAlchemy

…erences

…pport of forward references in relationships

…QLAlchemy

…thods

github-actions · 2023-11-18T10:23:26Z

📝 Docs preview for commit 80a5c52 at: https://77c66c1a.sqlmodel.pages.dev

github-actions · 2023-11-18T11:16:04Z

📝 Docs preview for commit 40beca9 at: https://b1ab6983.sqlmodel.pages.dev

github-actions · 2023-11-18T11:27:30Z

📝 Docs preview for commit be5277e at: https://0db51043.sqlmodel.pages.dev

tiangolo · 2023-11-18T10:20:09Z

✨ Upgrade SQLAlchemy to 2.0, including initial work by @farahats9

This includes @farahats9 commits from #563 and builds on top.

I reverted a few things, e.g. altering the docs to workaround for a previous lack of support for forward references.
Added support/fix for forward reference errors.
Removed several sections/modules that are no longer necessary, as were mainly to add type annotations to SQLAlchemy things, but now with SQLAlchemy's new proper types that's no longer necessary and I can reuse SQLAlchemy's things directly.
Updated all needed tests, e.g. to support the latest FastAPI.
Updated all the generated selects to use the new SQLAlchemy types.
Updated the classes and type annotations with the new SQLAlchemy types, with some overloads to make sure they are compatible with SQLModel. E.g. select().where().
Redefine all functions that would take column operations to accept the types used by SQLModel, e.g. or_(Hero.name == "Deadpond") as SQLAlchemy's version would require Hero.name to be a Mapped[str] instead of a str.
I explored a lot if it was possible/sensible to use and encourage the new Mapped[X], but sadly that breaks type annotations for creating new instances and dataclass_transform, as then that would expect to receive values with Mapped[X], e.g. Mapped[str] instead of str. And it would also add complications to the Pydantic handling. So, this was a lot of work mostly exploratory, but not much ended in the PR.

Co-authored-by: Stefan Borer <stefan.borer@gmail.com>

Fix most linting errors

…pes, now beautifully defined in SQLAlchemy

…erences

…pport of forward references in relationships

…QLAlchemy

…thods

github-actions · 2023-11-18T10:23:26Z

📝 Docs preview for commit 80a5c52 at: https://77c66c1a.sqlmodel.pages.dev

github-actions · 2023-11-18T11:16:04Z

📝 Docs preview for commit 40beca9 at: https://b1ab6983.sqlmodel.pages.dev

github-actions · 2023-11-18T11:27:30Z

📝 Docs preview for commit be5277e at: https://0db51043.sqlmodel.pages.dev

tiangolo · 2023-11-18T10:20:09Z

✨ Upgrade SQLAlchemy to 2.0, including initial work by @farahats9

This includes @farahats9 commits from #563 and builds on top.

I reverted a few things, e.g. altering the docs to workaround for a previous lack of support for forward references.
Added support/fix for forward reference errors.
Removed several sections/modules that are no longer necessary, as were mainly to add type annotations to SQLAlchemy things, but now with SQLAlchemy's new proper types that's no longer necessary and I can reuse SQLAlchemy's things directly.
Updated all needed tests, e.g. to support the latest FastAPI.
Updated all the generated selects to use the new SQLAlchemy types.
Updated the classes and type annotations with the new SQLAlchemy types, with some overloads to make sure they are compatible with SQLModel. E.g. select().where().
Redefine all functions that would take column operations to accept the types used by SQLModel, e.g. or_(Hero.name == "Deadpond") as SQLAlchemy's version would require Hero.name to be a Mapped[str] instead of a str.
I explored a lot if it was possible/sensible to use and encourage the new Mapped[X], but sadly that breaks type annotations for creating new instances and dataclass_transform, as then that would expect to receive values with Mapped[X], e.g. Mapped[str] instead of str. And it would also add complications to the Pydantic handling. So, this was a lot of work mostly exploratory, but not much ended in the PR.

Co-authored-by: Stefan Borer <stefan.borer@gmail.com>

Fix most linting errors

…pes, now beautifully defined in SQLAlchemy

…erences

…pport of forward references in relationships

…QLAlchemy

…thods

github-actions · 2023-11-18T10:23:26Z

📝 Docs preview for commit 80a5c52 at: https://77c66c1a.sqlmodel.pages.dev

github-actions · 2023-11-18T11:16:04Z

📝 Docs preview for commit 40beca9 at: https://b1ab6983.sqlmodel.pages.dev

github-actions · 2023-11-18T11:27:30Z

📝 Docs preview for commit be5277e at: https://0db51043.sqlmodel.pages.dev

tiangolo · 2023-11-18T10:20:09Z

✨ Upgrade SQLAlchemy to 2.0, including initial work by @farahats9

This includes @farahats9 commits from #563 and builds on top.

I reverted a few things, e.g. altering the docs to workaround for a previous lack of support for forward references.
Added support/fix for forward reference errors.
Removed several sections/modules that are no longer necessary, as were mainly to add type annotations to SQLAlchemy things, but now with SQLAlchemy's new proper types that's no longer necessary and I can reuse SQLAlchemy's things directly.
Updated all needed tests, e.g. to support the latest FastAPI.
Updated all the generated selects to use the new SQLAlchemy types.
Updated the classes and type annotations with the new SQLAlchemy types, with some overloads to make sure they are compatible with SQLModel. E.g. select().where().
Redefine all functions that would take column operations to accept the types used by SQLModel, e.g. or_(Hero.name == "Deadpond") as SQLAlchemy's version would require Hero.name to be a Mapped[str] instead of a str.
I explored a lot if it was possible/sensible to use and encourage the new Mapped[X], but sadly that breaks type annotations for creating new instances and dataclass_transform, as then that would expect to receive values with Mapped[X], e.g. Mapped[str] instead of str. And it would also add complications to the Pydantic handling. So, this was a lot of work mostly exploratory, but not much ended in the PR.

Co-authored-by: Stefan Borer <stefan.borer@gmail.com>

Fix most linting errors

…pes, now beautifully defined in SQLAlchemy

…erences

…pport of forward references in relationships

…QLAlchemy

…thods

github-actions · 2023-11-18T10:23:26Z

📝 Docs preview for commit 80a5c52 at: https://77c66c1a.sqlmodel.pages.dev

github-actions · 2023-11-18T11:16:04Z

📝 Docs preview for commit 40beca9 at: https://b1ab6983.sqlmodel.pages.dev

github-actions · 2023-11-18T11:27:30Z

📝 Docs preview for commit be5277e at: https://0db51043.sqlmodel.pages.dev

tiangolo · 2023-11-18T10:20:09Z

✨ Upgrade SQLAlchemy to 2.0, including initial work by @farahats9

This includes @farahats9 commits from #563 and builds on top.

I reverted a few things, e.g. altering the docs to workaround for a previous lack of support for forward references.
Added support/fix for forward reference errors.
Removed several sections/modules that are no longer necessary, as were mainly to add type annotations to SQLAlchemy things, but now with SQLAlchemy's new proper types that's no longer necessary and I can reuse SQLAlchemy's things directly.
Updated all needed tests, e.g. to support the latest FastAPI.
Updated all the generated selects to use the new SQLAlchemy types.
Updated the classes and type annotations with the new SQLAlchemy types, with some overloads to make sure they are compatible with SQLModel. E.g. select().where().
Redefine all functions that would take column operations to accept the types used by SQLModel, e.g. or_(Hero.name == "Deadpond") as SQLAlchemy's version would require Hero.name to be a Mapped[str] instead of a str.
I explored a lot if it was possible/sensible to use and encourage the new Mapped[X], but sadly that breaks type annotations for creating new instances and dataclass_transform, as then that would expect to receive values with Mapped[X], e.g. Mapped[str] instead of str. And it would also add complications to the Pydantic handling. So, this was a lot of work mostly exploratory, but not much ended in the PR.

Co-authored-by: Stefan Borer <stefan.borer@gmail.com>

Fix most linting errors

…pes, now beautifully defined in SQLAlchemy

…erences

…pport of forward references in relationships

…QLAlchemy

…thods

github-actions · 2023-11-18T10:23:26Z

📝 Docs preview for commit 80a5c52 at: https://77c66c1a.sqlmodel.pages.dev

github-actions · 2023-11-18T11:16:04Z

📝 Docs preview for commit 40beca9 at: https://b1ab6983.sqlmodel.pages.dev

github-actions · 2023-11-18T11:27:30Z

📝 Docs preview for commit be5277e at: https://0db51043.sqlmodel.pages.dev

tiangolo · 2023-11-18T10:20:09Z

✨ Upgrade SQLAlchemy to 2.0, including initial work by @farahats9

This includes @farahats9 commits from #563 and builds on top.

I reverted a few things, e.g. altering the docs to workaround for a previous lack of support for forward references.
Added support/fix for forward reference errors.
Removed several sections/modules that are no longer necessary, as were mainly to add type annotations to SQLAlchemy things, but now with SQLAlchemy's new proper types that's no longer necessary and I can reuse SQLAlchemy's things directly.
Updated all needed tests, e.g. to support the latest FastAPI.
Updated all the generated selects to use the new SQLAlchemy types.
Updated the classes and type annotations with the new SQLAlchemy types, with some overloads to make sure they are compatible with SQLModel. E.g. select().where().
Redefine all functions that would take column operations to accept the types used by SQLModel, e.g. or_(Hero.name == "Deadpond") as SQLAlchemy's version would require Hero.name to be a Mapped[str] instead of a str.
I explored a lot if it was possible/sensible to use and encourage the new Mapped[X], but sadly that breaks type annotations for creating new instances and dataclass_transform, as then that would expect to receive values with Mapped[X], e.g. Mapped[str] instead of str. And it would also add complications to the Pydantic handling. So, this was a lot of work mostly exploratory, but not much ended in the PR.

Co-authored-by: Stefan Borer <stefan.borer@gmail.com>

Fix most linting errors

…pes, now beautifully defined in SQLAlchemy

…erences

…pport of forward references in relationships

…QLAlchemy

…thods

github-actions · 2023-11-18T10:23:26Z

📝 Docs preview for commit 80a5c52 at: https://77c66c1a.sqlmodel.pages.dev

github-actions · 2023-11-18T11:16:04Z

📝 Docs preview for commit 40beca9 at: https://b1ab6983.sqlmodel.pages.dev

github-actions · 2023-11-18T11:27:30Z

📝 Docs preview for commit be5277e at: https://0db51043.sqlmodel.pages.dev

tiangolo · 2023-11-18T10:20:09Z

✨ Upgrade SQLAlchemy to 2.0, including initial work by @farahats9

This includes @farahats9 commits from #563 and builds on top.

I reverted a few things, e.g. altering the docs to workaround for a previous lack of support for forward references.
Added support/fix for forward reference errors.
Removed several sections/modules that are no longer necessary, as were mainly to add type annotations to SQLAlchemy things, but now with SQLAlchemy's new proper types that's no longer necessary and I can reuse SQLAlchemy's things directly.
Updated all needed tests, e.g. to support the latest FastAPI.
Updated all the generated selects to use the new SQLAlchemy types.
Updated the classes and type annotations with the new SQLAlchemy types, with some overloads to make sure they are compatible with SQLModel. E.g. select().where().
Redefine all functions that would take column operations to accept the types used by SQLModel, e.g. or_(Hero.name == "Deadpond") as SQLAlchemy's version would require Hero.name to be a Mapped[str] instead of a str.
I explored a lot if it was possible/sensible to use and encourage the new Mapped[X], but sadly that breaks type annotations for creating new instances and dataclass_transform, as then that would expect to receive values with Mapped[X], e.g. Mapped[str] instead of str. And it would also add complications to the Pydantic handling. So, this was a lot of work mostly exploratory, but not much ended in the PR.

Co-authored-by: Stefan Borer <stefan.borer@gmail.com>

Fix most linting errors

…pes, now beautifully defined in SQLAlchemy

…erences

…pport of forward references in relationships

…QLAlchemy

…thods

github-actions · 2023-11-18T10:23:26Z

📝 Docs preview for commit 80a5c52 at: https://77c66c1a.sqlmodel.pages.dev

github-actions · 2023-11-18T11:16:04Z

📝 Docs preview for commit 40beca9 at: https://b1ab6983.sqlmodel.pages.dev

github-actions · 2023-11-18T11:27:30Z

📝 Docs preview for commit be5277e at: https://0db51043.sqlmodel.pages.dev

tiangolo · 2023-11-18T10:20:09Z

✨ Upgrade SQLAlchemy to 2.0, including initial work by @farahats9

This includes @farahats9 commits from #563 and builds on top.

I reverted a few things, e.g. altering the docs to workaround for a previous lack of support for forward references.
Added support/fix for forward reference errors.
Removed several sections/modules that are no longer necessary, as were mainly to add type annotations to SQLAlchemy things, but now with SQLAlchemy's new proper types that's no longer necessary and I can reuse SQLAlchemy's things directly.
Updated all needed tests, e.g. to support the latest FastAPI.
Updated all the generated selects to use the new SQLAlchemy types.
Updated the classes and type annotations with the new SQLAlchemy types, with some overloads to make sure they are compatible with SQLModel. E.g. select().where().
Redefine all functions that would take column operations to accept the types used by SQLModel, e.g. or_(Hero.name == "Deadpond") as SQLAlchemy's version would require Hero.name to be a Mapped[str] instead of a str.
I explored a lot if it was possible/sensible to use and encourage the new Mapped[X], but sadly that breaks type annotations for creating new instances and dataclass_transform, as then that would expect to receive values with Mapped[X], e.g. Mapped[str] instead of str. And it would also add complications to the Pydantic handling. So, this was a lot of work mostly exploratory, but not much ended in the PR.

Co-authored-by: Stefan Borer <stefan.borer@gmail.com>

Fix most linting errors

…pes, now beautifully defined in SQLAlchemy

…erences

…pport of forward references in relationships

…QLAlchemy

…thods

github-actions · 2023-11-18T10:23:26Z

📝 Docs preview for commit 80a5c52 at: https://77c66c1a.sqlmodel.pages.dev

github-actions · 2023-11-18T11:16:04Z

📝 Docs preview for commit 40beca9 at: https://b1ab6983.sqlmodel.pages.dev

github-actions · 2023-11-18T11:27:30Z

📝 Docs preview for commit be5277e at: https://0db51043.sqlmodel.pages.dev

farahats9and others added 30 commits March 7, 2023 02:08

migration to sqlalchemy 2.0
60318b4

fix some linting errors
48ddc61

remove unused imports
b48423f

Update sqlmodel/sql/expression.py
9c219d9
Co-authored-by: Stefan Borer <stefan.borer@gmail.com>

reflecting python 3.6 deprecation in docs and tests
37ed979

Merge branch 'main' ofhttps://github.com/farahats9/sqlmodel
0eee8e8

resolving@sbor23comments
050cf02

add the new Subquery class
fbff99c

update to latest sqlalchemy version
6d8f527

fix jinja2 template
4ce8d07

Result expects a type Tuple[_T]
ecfb321

Remove unused type ignore
3738a7f

Result seems well enough typed in SqlAlchemy now we can simply shim over
814988b

Implicit export of ForwardRef was remove in pydantic
118ca33

_Select expects a Tuple[Any, ...]
9170729

Use Dict type instead of Mapping for SqlAlchemy compat
7f5ba1c

Execution options are not Optional in SA
e942e5e

Another instance of non-optional execution_options
ef9f00a

Fix Tuple in jinja template as well
643cea5

Use ForUpdateArg from sqlalchemy
b89adbb

Fix signature for Session.get
eff0803

Merge pull request#2from peterlandry/main
c5bdbcc
Fix most linting errors

formatting and remove unused type
1752f0b

🔀 Merge branch 'main' into sa2-a
b4f4a4f

📝 Do not claim Python 3.11 yet, this will be done in a subsequent PR
4d264a3

🔥 Remove no longer necessary engine module, it was only to provide ty…
5f52693
…pes, now beautifully defined in SQLAlchemy

⏪️ Revert altering tutorial, avoiding lack of support for forward ref…
0468d6f
…erences

🐛 Fix support for forward references in relationships
fcb92a0

✅ Update tests for newest FastAPI with OpenAPI 3.1.0
f02584b

⏪️ Revert altering tutorial to accomodate for the previous lack of su…
f4127d2
…pport of forward references in relationships

tiangolo added 8 commits November 17, 2023 22:24

✨ Update and refactor expression (and template) with new types from S…
50cb798
…QLAlchemy

🎨 Update type annotation in sqltypes.py
2083ba6

♻️ Refactor generation of expression.py with template
8672bfa

✨ Update Session types and logic, add deprecations for discouraged me…
b433b7d
…thods

✨ Update import and export locations
4ada203

🔧 Update mypy config for docs_src
aa27b2b

⬆️ Update SQLAlchemy dependency pin
baa5e3a

✨ Update AsyncSession with support for SQLAlchemy 2.0 and new Session
80a5c52

tiangolo added 4 commits November 18, 2023 12:04

✨ Add some new re-exported objects from SQLAlchemy
61f6a1f

♻️ Update type annotations of expression.py to support old Pythons
7e9971d

⬆️ Upgrade FastAPI and HTTPX dependency for tests
62327ce

Merge branch 'main' into sa2-a
40beca9

🔇 Do not run mypy on Python 3.7 as it behaves differently
be5277e

tiangolo marked this pull request as ready for review November 18, 2023 11:29

tiangolo added the feature New feature or request label Nov 18, 2023

tiangolo changed the title ~~✨ Upgrade SQLAlchemy to 2.0, including initial work by @farahats9~~✨ Upgrade SQLAlchemy to 2.0, including initial work by farahats9Nov 18, 2023

tiangolo merged commit 8ed856d into mainNov 18, 2023

tiangolo deleted the sa2-a branch November 18, 2023 11:30

tiangolo mentioned this pull request Nov 18, 2023
migration to sqlalchemy 2.0 #563
Closed

podsvirov mentioned this pull request Nov 18, 2023
python-sqlmodel: New package msys2/MINGW-packages#17403
Merged

tiangolo mentioned this pull request Nov 20, 2023
🚀 Roadmap #654
Open
9 tasks

duynguyen158 mentioned this pull request Nov 28, 2023
Upgrade to SQLAlchemy 2.0 LocalAtBrown/article-rec-db#16
Merged

farahats9and others added 30 commits March 7, 2023 02:08

migration to sqlalchemy 2.0
60318b4

fix some linting errors
48ddc61

remove unused imports
b48423f

Update sqlmodel/sql/expression.py
9c219d9
Co-authored-by: Stefan Borer <stefan.borer@gmail.com>

reflecting python 3.6 deprecation in docs and tests
37ed979

Merge branch 'main' ofhttps://github.com/farahats9/sqlmodel
0eee8e8

resolving@sbor23comments
050cf02

add the new Subquery class
fbff99c

update to latest sqlalchemy version
6d8f527

fix jinja2 template
4ce8d07

Result expects a type Tuple[_T]
ecfb321

Remove unused type ignore
3738a7f

Result seems well enough typed in SqlAlchemy now we can simply shim over
814988b

Implicit export of ForwardRef was remove in pydantic
118ca33

_Select expects a Tuple[Any, ...]
9170729

Use Dict type instead of Mapping for SqlAlchemy compat
7f5ba1c

Execution options are not Optional in SA
e942e5e

Another instance of non-optional execution_options
ef9f00a

Fix Tuple in jinja template as well
643cea5

Use ForUpdateArg from sqlalchemy
b89adbb

Fix signature for Session.get
eff0803

Merge pull request#2from peterlandry/main
c5bdbcc
Fix most linting errors

formatting and remove unused type
1752f0b

🔀 Merge branch 'main' into sa2-a
b4f4a4f

📝 Do not claim Python 3.11 yet, this will be done in a subsequent PR
4d264a3

🔥 Remove no longer necessary engine module, it was only to provide ty…
5f52693
…pes, now beautifully defined in SQLAlchemy

⏪️ Revert altering tutorial, avoiding lack of support for forward ref…
0468d6f
…erences

🐛 Fix support for forward references in relationships
fcb92a0

✅ Update tests for newest FastAPI with OpenAPI 3.1.0
f02584b

⏪️ Revert altering tutorial to accomodate for the previous lack of su…
f4127d2
…pport of forward references in relationships

tiangolo added 8 commits November 17, 2023 22:24

✨ Update and refactor expression (and template) with new types from S…
50cb798
…QLAlchemy

🎨 Update type annotation in sqltypes.py
2083ba6

♻️ Refactor generation of expression.py with template
8672bfa

✨ Update Session types and logic, add deprecations for discouraged me…
b433b7d
…thods

✨ Update import and export locations
4ada203

🔧 Update mypy config for docs_src
aa27b2b

⬆️ Update SQLAlchemy dependency pin
baa5e3a

✨ Update AsyncSession with support for SQLAlchemy 2.0 and new Session
80a5c52

tiangolo added 4 commits November 18, 2023 12:04

✨ Add some new re-exported objects from SQLAlchemy
61f6a1f

♻️ Update type annotations of expression.py to support old Pythons
7e9971d

⬆️ Upgrade FastAPI and HTTPX dependency for tests
62327ce

Merge branch 'main' into sa2-a
40beca9

🔇 Do not run mypy on Python 3.7 as it behaves differently
be5277e

tiangolo marked this pull request as ready for review November 18, 2023 11:29

tiangolo added the feature New feature or request label Nov 18, 2023

tiangolo changed the title ~~✨ Upgrade SQLAlchemy to 2.0, including initial work by @farahats9~~✨ Upgrade SQLAlchemy to 2.0, including initial work by farahats9Nov 18, 2023

tiangolo merged commit 8ed856d into mainNov 18, 2023

tiangolo deleted the sa2-a branch November 18, 2023 11:30

tiangolo mentioned this pull request Nov 18, 2023
migration to sqlalchemy 2.0 #563
Closed

podsvirov mentioned this pull request Nov 18, 2023
python-sqlmodel: New package msys2/MINGW-packages#17403
Merged

tiangolo mentioned this pull request Nov 20, 2023
🚀 Roadmap #654
Open
9 tasks

duynguyen158 mentioned this pull request Nov 28, 2023
Upgrade to SQLAlchemy 2.0 LocalAtBrown/article-rec-db#16
Merged

farahats9and others added 30 commits March 7, 2023 02:08

migration to sqlalchemy 2.0
60318b4

fix some linting errors
48ddc61

remove unused imports
b48423f

Update sqlmodel/sql/expression.py
9c219d9
Co-authored-by: Stefan Borer <stefan.borer@gmail.com>

reflecting python 3.6 deprecation in docs and tests
37ed979

Merge branch 'main' ofhttps://github.com/farahats9/sqlmodel
0eee8e8

resolving@sbor23comments
050cf02

add the new Subquery class
fbff99c

update to latest sqlalchemy version
6d8f527

fix jinja2 template
4ce8d07

Result expects a type Tuple[_T]
ecfb321

Remove unused type ignore
3738a7f

Result seems well enough typed in SqlAlchemy now we can simply shim over
814988b

Implicit export of ForwardRef was remove in pydantic
118ca33

_Select expects a Tuple[Any, ...]
9170729

Use Dict type instead of Mapping for SqlAlchemy compat
7f5ba1c

Execution options are not Optional in SA
e942e5e

Another instance of non-optional execution_options
ef9f00a

Fix Tuple in jinja template as well
643cea5

Use ForUpdateArg from sqlalchemy
b89adbb

Fix signature for Session.get
eff0803

Merge pull request#2from peterlandry/main
c5bdbcc
Fix most linting errors

formatting and remove unused type
1752f0b

🔀 Merge branch 'main' into sa2-a
b4f4a4f

📝 Do not claim Python 3.11 yet, this will be done in a subsequent PR
4d264a3

🔥 Remove no longer necessary engine module, it was only to provide ty…
5f52693
…pes, now beautifully defined in SQLAlchemy

⏪️ Revert altering tutorial, avoiding lack of support for forward ref…
0468d6f
…erences

🐛 Fix support for forward references in relationships
fcb92a0

✅ Update tests for newest FastAPI with OpenAPI 3.1.0
f02584b

⏪️ Revert altering tutorial to accomodate for the previous lack of su…
f4127d2
…pport of forward references in relationships

tiangolo added 8 commits November 17, 2023 22:24

✨ Update and refactor expression (and template) with new types from S…
50cb798
…QLAlchemy

🎨 Update type annotation in sqltypes.py
2083ba6

♻️ Refactor generation of expression.py with template
8672bfa

✨ Update Session types and logic, add deprecations for discouraged me…
b433b7d
…thods

✨ Update import and export locations
4ada203

🔧 Update mypy config for docs_src
aa27b2b

⬆️ Update SQLAlchemy dependency pin
baa5e3a

✨ Update AsyncSession with support for SQLAlchemy 2.0 and new Session
80a5c52

tiangolo added 4 commits November 18, 2023 12:04

✨ Add some new re-exported objects from SQLAlchemy
61f6a1f

♻️ Update type annotations of expression.py to support old Pythons
7e9971d

⬆️ Upgrade FastAPI and HTTPX dependency for tests
62327ce

Merge branch 'main' into sa2-a
40beca9

🔇 Do not run mypy on Python 3.7 as it behaves differently
be5277e

tiangolo marked this pull request as ready for review November 18, 2023 11:29

tiangolo added the feature New feature or request label Nov 18, 2023

tiangolo changed the title ~~✨ Upgrade SQLAlchemy to 2.0, including initial work by @farahats9~~✨ Upgrade SQLAlchemy to 2.0, including initial work by farahats9Nov 18, 2023

tiangolo merged commit 8ed856d into mainNov 18, 2023

tiangolo deleted the sa2-a branch November 18, 2023 11:30

tiangolo mentioned this pull request Nov 18, 2023
migration to sqlalchemy 2.0 #563
Closed

podsvirov mentioned this pull request Nov 18, 2023
python-sqlmodel: New package msys2/MINGW-packages#17403
Merged

tiangolo mentioned this pull request Nov 20, 2023
🚀 Roadmap #654
Open
9 tasks

duynguyen158 mentioned this pull request Nov 28, 2023
Upgrade to SQLAlchemy 2.0 LocalAtBrown/article-rec-db#16
Merged

farahats9and others added 30 commits March 7, 2023 02:08

migration to sqlalchemy 2.0
60318b4

fix some linting errors
48ddc61

remove unused imports
b48423f

Update sqlmodel/sql/expression.py
9c219d9
Co-authored-by: Stefan Borer <stefan.borer@gmail.com>

reflecting python 3.6 deprecation in docs and tests
37ed979

Merge branch 'main' ofhttps://github.com/farahats9/sqlmodel
0eee8e8

resolving@sbor23comments
050cf02

add the new Subquery class
fbff99c

update to latest sqlalchemy version
6d8f527

fix jinja2 template
4ce8d07

Result expects a type Tuple[_T]
ecfb321

Remove unused type ignore
3738a7f

Result seems well enough typed in SqlAlchemy now we can simply shim over
814988b

Implicit export of ForwardRef was remove in pydantic
118ca33

_Select expects a Tuple[Any, ...]
9170729

Use Dict type instead of Mapping for SqlAlchemy compat
7f5ba1c

Execution options are not Optional in SA
e942e5e

Another instance of non-optional execution_options
ef9f00a

Fix Tuple in jinja template as well
643cea5

Use ForUpdateArg from sqlalchemy
b89adbb

Fix signature for Session.get
eff0803

Merge pull request#2from peterlandry/main
c5bdbcc
Fix most linting errors

formatting and remove unused type
1752f0b

🔀 Merge branch 'main' into sa2-a
b4f4a4f

📝 Do not claim Python 3.11 yet, this will be done in a subsequent PR
4d264a3

🔥 Remove no longer necessary engine module, it was only to provide ty…
5f52693
…pes, now beautifully defined in SQLAlchemy

⏪️ Revert altering tutorial, avoiding lack of support for forward ref…
0468d6f
…erences

🐛 Fix support for forward references in relationships
fcb92a0

✅ Update tests for newest FastAPI with OpenAPI 3.1.0
f02584b

⏪️ Revert altering tutorial to accomodate for the previous lack of su…
f4127d2
…pport of forward references in relationships

tiangolo added 8 commits November 17, 2023 22:24

✨ Update and refactor expression (and template) with new types from S…
50cb798
…QLAlchemy

🎨 Update type annotation in sqltypes.py
2083ba6

♻️ Refactor generation of expression.py with template
8672bfa

✨ Update Session types and logic, add deprecations for discouraged me…
b433b7d
…thods

✨ Update import and export locations
4ada203

🔧 Update mypy config for docs_src
aa27b2b

⬆️ Update SQLAlchemy dependency pin
baa5e3a

✨ Update AsyncSession with support for SQLAlchemy 2.0 and new Session
80a5c52

tiangolo added 4 commits November 18, 2023 12:04

✨ Add some new re-exported objects from SQLAlchemy
61f6a1f

♻️ Update type annotations of expression.py to support old Pythons
7e9971d

⬆️ Upgrade FastAPI and HTTPX dependency for tests
62327ce

Merge branch 'main' into sa2-a
40beca9

🔇 Do not run mypy on Python 3.7 as it behaves differently
be5277e

tiangolo marked this pull request as ready for review November 18, 2023 11:29

tiangolo added the feature New feature or request label Nov 18, 2023

tiangolo changed the title ~~✨ Upgrade SQLAlchemy to 2.0, including initial work by @farahats9~~✨ Upgrade SQLAlchemy to 2.0, including initial work by farahats9Nov 18, 2023

tiangolo merged commit 8ed856d into mainNov 18, 2023

tiangolo deleted the sa2-a branch November 18, 2023 11:30

tiangolo mentioned this pull request Nov 18, 2023
migration to sqlalchemy 2.0 #563
Closed

podsvirov mentioned this pull request Nov 18, 2023
python-sqlmodel: New package msys2/MINGW-packages#17403
Merged

tiangolo mentioned this pull request Nov 20, 2023
🚀 Roadmap #654
Open
9 tasks

duynguyen158 mentioned this pull request Nov 28, 2023
Upgrade to SQLAlchemy 2.0 LocalAtBrown/article-rec-db#16
Merged

farahats9and others added 30 commits March 7, 2023 02:08

migration to sqlalchemy 2.0
60318b4

fix some linting errors
48ddc61

remove unused imports
b48423f

Update sqlmodel/sql/expression.py
9c219d9
Co-authored-by: Stefan Borer <stefan.borer@gmail.com>

reflecting python 3.6 deprecation in docs and tests
37ed979

Merge branch 'main' ofhttps://github.com/farahats9/sqlmodel
0eee8e8

resolving@sbor23comments
050cf02

add the new Subquery class
fbff99c

update to latest sqlalchemy version
6d8f527

fix jinja2 template
4ce8d07

Result expects a type Tuple[_T]
ecfb321

Remove unused type ignore
3738a7f

Result seems well enough typed in SqlAlchemy now we can simply shim over
814988b

Implicit export of ForwardRef was remove in pydantic
118ca33

_Select expects a Tuple[Any, ...]
9170729

Use Dict type instead of Mapping for SqlAlchemy compat
7f5ba1c

Execution options are not Optional in SA
e942e5e

Another instance of non-optional execution_options
ef9f00a

Fix Tuple in jinja template as well
643cea5

Use ForUpdateArg from sqlalchemy
b89adbb

Fix signature for Session.get
eff0803

Merge pull request#2from peterlandry/main
c5bdbcc
Fix most linting errors

formatting and remove unused type
1752f0b

🔀 Merge branch 'main' into sa2-a
b4f4a4f

📝 Do not claim Python 3.11 yet, this will be done in a subsequent PR
4d264a3

🔥 Remove no longer necessary engine module, it was only to provide ty…
5f52693
…pes, now beautifully defined in SQLAlchemy

⏪️ Revert altering tutorial, avoiding lack of support for forward ref…
0468d6f
…erences

🐛 Fix support for forward references in relationships
fcb92a0

✅ Update tests for newest FastAPI with OpenAPI 3.1.0
f02584b

⏪️ Revert altering tutorial to accomodate for the previous lack of su…
f4127d2
…pport of forward references in relationships

tiangolo added 8 commits November 17, 2023 22:24

✨ Update and refactor expression (and template) with new types from S…
50cb798
…QLAlchemy

🎨 Update type annotation in sqltypes.py
2083ba6

♻️ Refactor generation of expression.py with template
8672bfa

✨ Update Session types and logic, add deprecations for discouraged me…
b433b7d
…thods

✨ Update import and export locations
4ada203

🔧 Update mypy config for docs_src
aa27b2b

⬆️ Update SQLAlchemy dependency pin
baa5e3a

✨ Update AsyncSession with support for SQLAlchemy 2.0 and new Session
80a5c52

tiangolo added 4 commits November 18, 2023 12:04

✨ Add some new re-exported objects from SQLAlchemy
61f6a1f

♻️ Update type annotations of expression.py to support old Pythons
7e9971d

⬆️ Upgrade FastAPI and HTTPX dependency for tests
62327ce

Merge branch 'main' into sa2-a
40beca9

🔇 Do not run mypy on Python 3.7 as it behaves differently
be5277e

tiangolo marked this pull request as ready for review November 18, 2023 11:29

tiangolo added the feature New feature or request label Nov 18, 2023

tiangolo changed the title ~~✨ Upgrade SQLAlchemy to 2.0, including initial work by @farahats9~~✨ Upgrade SQLAlchemy to 2.0, including initial work by farahats9Nov 18, 2023

tiangolo merged commit 8ed856d into mainNov 18, 2023

tiangolo deleted the sa2-a branch November 18, 2023 11:30

tiangolo mentioned this pull request Nov 18, 2023
migration to sqlalchemy 2.0 #563
Closed

podsvirov mentioned this pull request Nov 18, 2023
python-sqlmodel: New package msys2/MINGW-packages#17403
Merged

tiangolo mentioned this pull request Nov 20, 2023
🚀 Roadmap #654
Open
9 tasks

duynguyen158 mentioned this pull request Nov 28, 2023
Upgrade to SQLAlchemy 2.0 LocalAtBrown/article-rec-db#16
Merged

farahats9and others added 30 commits March 7, 2023 02:08

migration to sqlalchemy 2.0
60318b4

fix some linting errors
48ddc61

remove unused imports
b48423f

Update sqlmodel/sql/expression.py
9c219d9
Co-authored-by: Stefan Borer <stefan.borer@gmail.com>

reflecting python 3.6 deprecation in docs and tests
37ed979

Merge branch 'main' ofhttps://github.com/farahats9/sqlmodel
0eee8e8

resolving@sbor23comments
050cf02

add the new Subquery class
fbff99c

update to latest sqlalchemy version
6d8f527

fix jinja2 template
4ce8d07

Result expects a type Tuple[_T]
ecfb321

Remove unused type ignore
3738a7f

Result seems well enough typed in SqlAlchemy now we can simply shim over
814988b

Implicit export of ForwardRef was remove in pydantic
118ca33

_Select expects a Tuple[Any, ...]
9170729

Use Dict type instead of Mapping for SqlAlchemy compat
7f5ba1c

Execution options are not Optional in SA
e942e5e

Another instance of non-optional execution_options
ef9f00a

Fix Tuple in jinja template as well
643cea5

Use ForUpdateArg from sqlalchemy
b89adbb

Fix signature for Session.get
eff0803

Merge pull request#2from peterlandry/main
c5bdbcc
Fix most linting errors

formatting and remove unused type
1752f0b

🔀 Merge branch 'main' into sa2-a
b4f4a4f

📝 Do not claim Python 3.11 yet, this will be done in a subsequent PR
4d264a3

🔥 Remove no longer necessary engine module, it was only to provide ty…
5f52693
…pes, now beautifully defined in SQLAlchemy

⏪️ Revert altering tutorial, avoiding lack of support for forward ref…
0468d6f
…erences

🐛 Fix support for forward references in relationships
fcb92a0

✅ Update tests for newest FastAPI with OpenAPI 3.1.0
f02584b

⏪️ Revert altering tutorial to accomodate for the previous lack of su…
f4127d2
…pport of forward references in relationships

tiangolo added 8 commits November 17, 2023 22:24

✨ Update and refactor expression (and template) with new types from S…
50cb798
…QLAlchemy

🎨 Update type annotation in sqltypes.py
2083ba6

♻️ Refactor generation of expression.py with template
8672bfa

✨ Update Session types and logic, add deprecations for discouraged me…
b433b7d
…thods

✨ Update import and export locations
4ada203

🔧 Update mypy config for docs_src
aa27b2b

⬆️ Update SQLAlchemy dependency pin
baa5e3a

✨ Update AsyncSession with support for SQLAlchemy 2.0 and new Session
80a5c52

tiangolo added 4 commits November 18, 2023 12:04

✨ Add some new re-exported objects from SQLAlchemy
61f6a1f

♻️ Update type annotations of expression.py to support old Pythons
7e9971d

⬆️ Upgrade FastAPI and HTTPX dependency for tests
62327ce

Merge branch 'main' into sa2-a
40beca9

🔇 Do not run mypy on Python 3.7 as it behaves differently
be5277e

tiangolo marked this pull request as ready for review November 18, 2023 11:29

tiangolo added the feature New feature or request label Nov 18, 2023

tiangolo changed the title ~~✨ Upgrade SQLAlchemy to 2.0, including initial work by @farahats9~~✨ Upgrade SQLAlchemy to 2.0, including initial work by farahats9Nov 18, 2023

tiangolo merged commit 8ed856d into mainNov 18, 2023

tiangolo deleted the sa2-a branch November 18, 2023 11:30

tiangolo mentioned this pull request Nov 18, 2023
migration to sqlalchemy 2.0 #563
Closed

podsvirov mentioned this pull request Nov 18, 2023
python-sqlmodel: New package msys2/MINGW-packages#17403
Merged

tiangolo mentioned this pull request Nov 20, 2023
🚀 Roadmap #654
Open
9 tasks

duynguyen158 mentioned this pull request Nov 28, 2023
Upgrade to SQLAlchemy 2.0 LocalAtBrown/article-rec-db#16
Merged

farahats9and others added 30 commits March 7, 2023 02:08

migration to sqlalchemy 2.0
60318b4

fix some linting errors
48ddc61

remove unused imports
b48423f

Update sqlmodel/sql/expression.py
9c219d9
Co-authored-by: Stefan Borer <stefan.borer@gmail.com>

reflecting python 3.6 deprecation in docs and tests
37ed979

Merge branch 'main' ofhttps://github.com/farahats9/sqlmodel
0eee8e8

resolving@sbor23comments
050cf02

add the new Subquery class
fbff99c

update to latest sqlalchemy version
6d8f527

fix jinja2 template
4ce8d07

Result expects a type Tuple[_T]
ecfb321

Remove unused type ignore
3738a7f

Result seems well enough typed in SqlAlchemy now we can simply shim over
814988b

Implicit export of ForwardRef was remove in pydantic
118ca33

_Select expects a Tuple[Any, ...]
9170729

Use Dict type instead of Mapping for SqlAlchemy compat
7f5ba1c

Execution options are not Optional in SA
e942e5e

Another instance of non-optional execution_options
ef9f00a

Fix Tuple in jinja template as well
643cea5

Use ForUpdateArg from sqlalchemy
b89adbb

Fix signature for Session.get
eff0803

Merge pull request#2from peterlandry/main
c5bdbcc
Fix most linting errors

formatting and remove unused type
1752f0b

🔀 Merge branch 'main' into sa2-a
b4f4a4f

📝 Do not claim Python 3.11 yet, this will be done in a subsequent PR
4d264a3

🔥 Remove no longer necessary engine module, it was only to provide ty…
5f52693
…pes, now beautifully defined in SQLAlchemy

⏪️ Revert altering tutorial, avoiding lack of support for forward ref…
0468d6f
…erences

🐛 Fix support for forward references in relationships
fcb92a0

✅ Update tests for newest FastAPI with OpenAPI 3.1.0
f02584b

⏪️ Revert altering tutorial to accomodate for the previous lack of su…
f4127d2
…pport of forward references in relationships

tiangolo added 8 commits November 17, 2023 22:24

✨ Update and refactor expression (and template) with new types from S…
50cb798
…QLAlchemy

🎨 Update type annotation in sqltypes.py
2083ba6

♻️ Refactor generation of expression.py with template
8672bfa

✨ Update Session types and logic, add deprecations for discouraged me…
b433b7d
…thods

✨ Update import and export locations
4ada203

🔧 Update mypy config for docs_src
aa27b2b

⬆️ Update SQLAlchemy dependency pin
baa5e3a

✨ Update AsyncSession with support for SQLAlchemy 2.0 and new Session
80a5c52

tiangolo added 4 commits November 18, 2023 12:04

✨ Add some new re-exported objects from SQLAlchemy
61f6a1f

♻️ Update type annotations of expression.py to support old Pythons
7e9971d

⬆️ Upgrade FastAPI and HTTPX dependency for tests
62327ce

Merge branch 'main' into sa2-a
40beca9

🔇 Do not run mypy on Python 3.7 as it behaves differently
be5277e

tiangolo marked this pull request as ready for review November 18, 2023 11:29

tiangolo added the feature New feature or request label Nov 18, 2023

tiangolo changed the title ~~✨ Upgrade SQLAlchemy to 2.0, including initial work by @farahats9~~✨ Upgrade SQLAlchemy to 2.0, including initial work by farahats9Nov 18, 2023

tiangolo merged commit 8ed856d into mainNov 18, 2023

tiangolo deleted the sa2-a branch November 18, 2023 11:30

tiangolo mentioned this pull request Nov 18, 2023
migration to sqlalchemy 2.0 #563
Closed

podsvirov mentioned this pull request Nov 18, 2023
python-sqlmodel: New package msys2/MINGW-packages#17403
Merged

tiangolo mentioned this pull request Nov 20, 2023
🚀 Roadmap #654
Open
9 tasks

duynguyen158 mentioned this pull request Nov 28, 2023
Upgrade to SQLAlchemy 2.0 LocalAtBrown/article-rec-db#16
Merged

farahats9and others added 30 commits March 7, 2023 02:08

migration to sqlalchemy 2.0
60318b4

fix some linting errors
48ddc61

remove unused imports
b48423f

Update sqlmodel/sql/expression.py
9c219d9
Co-authored-by: Stefan Borer <stefan.borer@gmail.com>

reflecting python 3.6 deprecation in docs and tests
37ed979

Merge branch 'main' ofhttps://github.com/farahats9/sqlmodel
0eee8e8

resolving@sbor23comments
050cf02

add the new Subquery class
fbff99c

update to latest sqlalchemy version
6d8f527

fix jinja2 template
4ce8d07

Result expects a type Tuple[_T]
ecfb321

Remove unused type ignore
3738a7f

Result seems well enough typed in SqlAlchemy now we can simply shim over
814988b

Implicit export of ForwardRef was remove in pydantic
118ca33

_Select expects a Tuple[Any, ...]
9170729

Use Dict type instead of Mapping for SqlAlchemy compat
7f5ba1c

Execution options are not Optional in SA
e942e5e

Another instance of non-optional execution_options
ef9f00a

Fix Tuple in jinja template as well
643cea5

Use ForUpdateArg from sqlalchemy
b89adbb

Fix signature for Session.get
eff0803

Merge pull request#2from peterlandry/main
c5bdbcc
Fix most linting errors

formatting and remove unused type
1752f0b

🔀 Merge branch 'main' into sa2-a
b4f4a4f

📝 Do not claim Python 3.11 yet, this will be done in a subsequent PR
4d264a3

🔥 Remove no longer necessary engine module, it was only to provide ty…
5f52693
…pes, now beautifully defined in SQLAlchemy

⏪️ Revert altering tutorial, avoiding lack of support for forward ref…
0468d6f
…erences

🐛 Fix support for forward references in relationships
fcb92a0

✅ Update tests for newest FastAPI with OpenAPI 3.1.0
f02584b

⏪️ Revert altering tutorial to accomodate for the previous lack of su…
f4127d2
…pport of forward references in relationships

tiangolo added 8 commits November 17, 2023 22:24

✨ Update and refactor expression (and template) with new types from S…
50cb798
…QLAlchemy

🎨 Update type annotation in sqltypes.py
2083ba6

♻️ Refactor generation of expression.py with template
8672bfa

✨ Update Session types and logic, add deprecations for discouraged me…
b433b7d
…thods

✨ Update import and export locations
4ada203

🔧 Update mypy config for docs_src
aa27b2b

⬆️ Update SQLAlchemy dependency pin
baa5e3a

✨ Update AsyncSession with support for SQLAlchemy 2.0 and new Session
80a5c52

tiangolo added 4 commits November 18, 2023 12:04

✨ Add some new re-exported objects from SQLAlchemy
61f6a1f

♻️ Update type annotations of expression.py to support old Pythons
7e9971d

⬆️ Upgrade FastAPI and HTTPX dependency for tests
62327ce

Merge branch 'main' into sa2-a
40beca9

🔇 Do not run mypy on Python 3.7 as it behaves differently
be5277e

tiangolo marked this pull request as ready for review November 18, 2023 11:29

tiangolo added the feature New feature or request label Nov 18, 2023

tiangolo changed the title ~~✨ Upgrade SQLAlchemy to 2.0, including initial work by @farahats9~~✨ Upgrade SQLAlchemy to 2.0, including initial work by farahats9Nov 18, 2023

tiangolo merged commit 8ed856d into mainNov 18, 2023

tiangolo deleted the sa2-a branch November 18, 2023 11:30

tiangolo mentioned this pull request Nov 18, 2023
migration to sqlalchemy 2.0 #563
Closed

podsvirov mentioned this pull request Nov 18, 2023
python-sqlmodel: New package msys2/MINGW-packages#17403
Merged

tiangolo mentioned this pull request Nov 20, 2023
🚀 Roadmap #654
Open
9 tasks

duynguyen158 mentioned this pull request Nov 28, 2023
Upgrade to SQLAlchemy 2.0 LocalAtBrown/article-rec-db#16
Merged

Uh oh!

Uh oh!

Conversation

tiangolo commented Nov 18, 2023• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actionsBot commented Nov 18, 2023

Uh oh!

github-actionsBot commented Nov 18, 2023

Uh oh!

github-actionsBot commented Nov 18, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Uh oh!

Conversation

tiangolo commented Nov 18, 2023• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actionsBot commented Nov 18, 2023

Uh oh!

github-actionsBot commented Nov 18, 2023

Uh oh!

github-actionsBot commented Nov 18, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Uh oh!

Conversation

tiangolo commented Nov 18, 2023• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actionsBot commented Nov 18, 2023

Uh oh!

github-actionsBot commented Nov 18, 2023

Uh oh!

github-actionsBot commented Nov 18, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Uh oh!

Conversation

tiangolo commented Nov 18, 2023• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actionsBot commented Nov 18, 2023

Uh oh!

github-actionsBot commented Nov 18, 2023

Uh oh!

github-actionsBot commented Nov 18, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

tiangolo commented Nov 18, 2023•
edited
Loading

tiangolo commented Nov 18, 2023•
edited
Loading

tiangolo commented Nov 18, 2023•
edited
Loading

tiangolo commented Nov 18, 2023•
edited
Loading

tiangolo commented Nov 18, 2023•
edited
Loading

tiangolo commented Nov 18, 2023•
edited
Loading