Skip to content

Flask-SQLAlchemy: Make model query non-generic #8455

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 10 commits into from
Aug 10, 2022
Merged

Flask-SQLAlchemy: Make model query non-generic #8455

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
878765d
Use typing.Self instead of Generic in model query
mano7onam Aug 1, 2022
9867ef2
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 1, 2022
a029a5f
Use _typeshed.Self
mano7onam Aug 1, 2022
10abe5e
Delete typing.Any
mano7onam Aug 1, 2022
a2021ad
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 1, 2022
f45d0ab
Return typing.Any
mano7onam Aug 1, 2022
350372b
Revert changes for model from #8389
mano7onam Aug 8, 2022
ced7ba3
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 8, 2022
40ea1d8
Update stubs/Flask-SQLAlchemy/flask_sqlalchemy/model.pyi
AlexWaygood Aug 10, 2022
89f096b
Update stubs/Flask-SQLAlchemy/flask_sqlalchemy/model.pyi
AlexWaygood Aug 10, 2022
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
10 changes: 4 additions & 6 deletions stubs/Flask-SQLAlchemy/flask_sqlalchemy/model.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
from re import Pattern
from typing import Any, Generic, TypeVar
from typing import Any

from sqlalchemy import Table
from sqlalchemy.ext.declarative import DeclarativeMeta
from sqlalchemy.orm import Query

_ModelT = TypeVar("_ModelT")

def should_set_tablename(cls: type) -> bool: ...

camelcase_re: Pattern[str]
Expand All @@ -22,6 +20,6 @@ class BindMetaMixin(type):

class DefaultMeta(NameMetaMixin, BindMetaMixin, DeclarativeMeta): ...

class Model(Generic[_ModelT]):
query_class: type[Query[_ModelT]] | None
query: Query[_ModelT] | None
class Model:
query_class: type[Query[Any]] | None
query: Query[Any] | None