From eda37ecf375f9b5fdea0bf0d2158459adeed9497 Mon Sep 17 00:00:00 2001 From: Tomasz Nowacki Date: Wed, 7 Feb 2024 18:28:07 +0100 Subject: [PATCH] move tests to a common file --- .../orm/column_expression_argument.py | 23 ------------------- .../plain_files/sql/common_sql_element.py | 13 +++++++++++ 2 files changed, 13 insertions(+), 23 deletions(-) delete mode 100644 test/typing/plain_files/orm/column_expression_argument.py diff --git a/test/typing/plain_files/orm/column_expression_argument.py b/test/typing/plain_files/orm/column_expression_argument.py deleted file mode 100644 index cc58afb6c5..0000000000 --- a/test/typing/plain_files/orm/column_expression_argument.py +++ /dev/null @@ -1,23 +0,0 @@ -from sqlalchemy import ColumnElement -from sqlalchemy import ColumnExpressionArgument -from sqlalchemy import true -from sqlalchemy.orm import DeclarativeBase -from sqlalchemy.orm import Mapped - - -class Base(DeclarativeBase): - ... - - -class HasPrivate(Base): - public: Mapped[bool] - - -def where_criteria(cls_: type[HasPrivate]) -> ColumnElement[bool]: - return cls_.public == true() - - -column_expression: ColumnExpressionArgument[bool] = where_criteria -column_expression_lambda: ColumnExpressionArgument[bool] = ( - lambda cls_: cls_.public == true() -) diff --git a/test/typing/plain_files/sql/common_sql_element.py b/test/typing/plain_files/sql/common_sql_element.py index 730d99bc15..d817443af1 100644 --- a/test/typing/plain_files/sql/common_sql_element.py +++ b/test/typing/plain_files/sql/common_sql_element.py @@ -12,6 +12,8 @@ from __future__ import annotations from sqlalchemy import asc from sqlalchemy import Column from sqlalchemy import column +from sqlalchemy import ColumnElement +from sqlalchemy import ColumnExpressionArgument from sqlalchemy import desc from sqlalchemy import Integer from sqlalchemy import literal @@ -172,3 +174,14 @@ mydict = { literal("5"): "q", column("q"): "q", } + + +# test 10959 +def where_criteria(cls_: type[User]) -> ColumnElement[bool]: + return cls_.email == "test" + + +column_expression: ColumnExpressionArgument[bool] = where_criteria +column_expression_lambda: ColumnExpressionArgument[bool] = ( + lambda cls_: cls_.email == "test" +) -- 2.47.2