Skip to content

Fix memoizedhascache #237

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 5 commits into from
Jan 18, 2023
Merged

Fix memoizedhascache #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
eb0a6f5
fix MemoizedHasCacheKey imports
mgmira Oct 9, 2022
95cb0a7
Merge branch 'main' into fix-memoized-has-cache
CaselIT Jan 16, 2023
3bc03d6
fix type errors
CaselIT Jan 16, 2023
60e4bf3
Ignore types to accept mapped
CaselIT Jan 16, 2023
6d80b86
Merge branch 'main' into fix-memoized-has-cache
CaselIT Jan 18, 2023
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
3 changes: 2 additions & 1 deletion sqlalchemy-stubs/orm/mapper.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ from ..sql import coercions as coercions
from ..sql import expression as expression
from ..sql import operators as operators
from ..sql import roles as roles
from ..sql import traversals as traversals
from ..sql import visitors as visitors
from ..sql.selectable import LABEL_STYLE_TABLENAME_PLUS_COL as LABEL_STYLE_TABLENAME_PLUS_COL
from ..util import HasMemoized as HasMemoized
Expand All @@ -35,7 +36,7 @@ NO_ATTRIBUTE: Any
class Mapper(
ORMFromClauseRole,
ORMEntityColumnsClauseRole,
sql_base.MemoizedHasCacheKey,
traversals.MemoizedHasCacheKey,
InspectionAttr,
):
class_: Any = ...
Expand Down
3 changes: 2 additions & 1 deletion sqlalchemy-stubs/orm/util.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ from ..sql import coercions as coercions
from ..sql import expression as expression
from ..sql import lambdas as lambdas
from ..sql import roles as roles
from ..sql import traversals as traversals
from ..sql import util as sql_util
from ..sql import visitors as visitors
from ..sql.annotation import SupportsCloneAnnotations as SupportsCloneAnnotations
Expand Down Expand Up @@ -88,7 +89,7 @@ class AliasedClass:
class AliasedInsp(
ORMEntityColumnsClauseRole,
ORMFromClauseRole,
sql_base.MemoizedHasCacheKey,
traversals.MemoizedHasCacheKey,
InspectionAttr,
):
mapper: Any = ...
Expand Down
8 changes: 4 additions & 4 deletions test/files/column_operators_binops.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ class A:
# error: Incompatible types in assignment (expression has type "bool", variable has type "ColumnElement[Boolean]") # noqa
# contains1: "ColumnElement[Boolean]" = A.id in A.arr

lshift1: "ColumnElement[Boolean]" = A.id << A.id
lshift2: "ColumnElement[Boolean]" = A.id << 1
lshift1: "ColumnElement[Integer]" = A.id << A.id
lshift2: "ColumnElement[Integer]" = A.id << 1

rshift1: "ColumnElement[Boolean]" = A.id >> A.id
rshift2: "ColumnElement[Boolean]" = A.id >> 1
rshift1: "ColumnElement[Integer]" = A.id >> A.id
rshift2: "ColumnElement[Integer]" = A.id >> 1

concat1: "ColumnElement[String]" = A.string.concat(A.string)
concat2: "ColumnElement[String]" = A.string.concat(1)
Expand Down