move tests to a common file

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 (file)
index cc58afb..0000000
--- 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 730d99bc1512470178d29003d90842e9f40a4d08..d817443af1e11a3479ecbafe808ea1904c39a380 100644 (file)
--- 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"
+)