python · JelleZijlstra · Apr 27, 2023 · Jan 27, 2023 · Jan 27, 2023 · Jan 29, 2023
diff --git a/stubs/SQLAlchemy/@tests/stubtest_allowlist.txt b/stubs/SQLAlchemy/@tests/stubtest_allowlist.txt
@@ -1,3 +1,10 @@
+# mypy plugin not supported in typeshed
+sqlalchemy.ext.mypy.*
+# test suites
+sqlalchemy.testing.suite
+# Leaked re-exports from the compat module
+sqlalchemy.util.quote
+
 # Expanding keyword arguments in stubs
 sqlalchemy.ext.declarative.as_declarative
 
@@ -25,9 +32,16 @@ sqlalchemy.engine.Connection.engine
 sqlalchemy.orm.Mapper.single
 sqlalchemy.orm.mapper.Mapper.single
 
-# uses @memoized_property at runtime, but we use @property for compatibility
+# Uses @memoized_property at runtime, but we use @property for compatibility
 sqlalchemy.engine.URL.normalized_query
 sqlalchemy.engine.url.URL.normalized_query
+# Uses @memoized_property, but that causes regr_test to raise 'Cannot determine type of "..." in base class "..."  [misc]'
+sqlalchemy.schema.SchemaItem.info
+sqlalchemy.sql.elements.AnnotatedColumnElement.info
+sqlalchemy.sql.elements.AnnotatedColumnElement.key
+sqlalchemy.sql.elements.AnnotatedColumnElement.name
+sqlalchemy.sql.elements.AnnotatedColumnElement.table
+sqlalchemy.sql.schema.SchemaItem.info
 
 # runtime has extra internal arguments that are inconsistent across micro versions
 sqlalchemy.testing.engines.testing_engine
@@ -62,8 +76,10 @@ sqlalchemy.sql.quoted_name.upper
 sqlalchemy.orm.ColumnProperty.Comparator.__clause_element__
 sqlalchemy.orm.properties.ColumnProperty.Comparator.__clause_element__
 
-# Same error as in stdlib due to it being re-erported
+# Same error as in stdlib due to it being re-exported
+sqlalchemy.dialects.mysql.asyncmy.AsyncAdapt_asyncmy_dbapi.Binary
 sqlalchemy.util.compat.StringIO.seek
 sqlalchemy.util.compat.StringIO.truncate
 sqlalchemy.util.StringIO.seek
 sqlalchemy.util.StringIO.truncate
+sqlalchemy.testing.mock.patch
diff --git a/stubs/SQLAlchemy/@tests/test_cases/check_register.py b/stubs/SQLAlchemy/@tests/test_cases/check_register.py
@@ -63,5 +63,6 @@ def no_args(__foo: Foo) -> None:
 prepare_for_drop_tables(url, unused)
 stop_test_class_outside_fixtures(url, unused, type)
 get_temp_table_name(url, unused, "")
+set_default_schema_on_connection(url, unused, unused)
 set_default_schema_on_connection(ConfigModule, unused, unused)
 set_default_schema_on_connection(config, unused, unused)
diff --git a/stubs/SQLAlchemy/METADATA.toml b/stubs/SQLAlchemy/METADATA.toml
@@ -7,4 +7,3 @@ obsolete_since = "2.0.0" # Released on 2023-01-26
 
 [tool.stubtest]
 stubtest_requirements = ["pytest"]
-ignore_missing_stub = true
diff --git a/stubs/SQLAlchemy/sqlalchemy/__init__.pyi b/stubs/SQLAlchemy/sqlalchemy/__init__.pyi
@@ -84,7 +84,7 @@ from .sql import (
     values as values,
     within_group as within_group,
 )
-from .types import (
+from .sql.sqltypes import (
     ARRAY as ARRAY,
     BIGINT as BIGINT,
     BINARY as BINARY,

diff --git a/stubs/SQLAlchemy/sqlalchemy/cprocessors.pyi b/stubs/SQLAlchemy/sqlalchemy/cprocessors.pyi
@@ -0,0 +1,15 @@
+class DecimalResultProcessor:
+    def __init__(self, *args, **kwargs) -> None: ...
+    def process(self, *args, **kwargs): ...
+
+class UnicodeResultProcessor:
+    def __init__(self, *args, **kwargs) -> None: ...
+    def conditional_process(self, *args, **kwargs): ...
+    def process(self, *args, **kwargs): ...
+
+def int_to_boolean(*args, **kwargs): ...
+def str_to_date(*args, **kwargs): ...
+def str_to_datetime(*args, **kwargs): ...
+def str_to_time(*args, **kwargs): ...
+def to_float(*args, **kwargs): ...
+def to_str(*args, **kwargs): ...
diff --git a/stubs/SQLAlchemy/sqlalchemy/dialects/firebird/__init__.pyi b/stubs/SQLAlchemy/sqlalchemy/dialects/firebird/__init__.pyi
@@ -1,6 +1,6 @@
 from typing import Any
 
-from sqlalchemy.dialects.firebird.base import (
+from .base import (
     BIGINT as BIGINT,
     BLOB as BLOB,
     CHAR as CHAR,

diff --git a/stubs/SQLAlchemy/sqlalchemy/dialects/firebird/base.pyi b/stubs/SQLAlchemy/sqlalchemy/dialects/firebird/base.pyi
@@ -1,10 +1,9 @@
 from _typeshed import Incomplete
 from typing import Any
 
-from sqlalchemy import sql, types as sqltypes
-from sqlalchemy.engine import default
-from sqlalchemy.sql import compiler
-from sqlalchemy.types import (
+from ...engine import default
+from ...sql import compiler, sqltypes
+from ...sql.sqltypes import (
     BIGINT as BIGINT,
     BLOB as BLOB,
     DATE as DATE,
@@ -46,7 +45,7 @@ class FBTypeCompiler(compiler.GenericTypeCompiler):
     def visit_CHAR(self, type_, **kw): ...
     def visit_VARCHAR(self, type_, **kw): ...
 
-class FBCompiler(sql.compiler.SQLCompiler):
+class FBCompiler(compiler.SQLCompiler):
     ansi_bind_rules: bool
     def visit_now_func(self, fn, **kw): ...
     def visit_startswith_op_binary(self, binary, operator, **kw): ...
@@ -63,12 +62,12 @@ class FBCompiler(sql.compiler.SQLCompiler):
     def limit_clause(self, select, **kw): ...
     def returning_clause(self, stmt, returning_cols): ...
 
-class FBDDLCompiler(sql.compiler.DDLCompiler):
+class FBDDLCompiler(compiler.DDLCompiler):
     def visit_create_sequence(self, create): ...
     def visit_drop_sequence(self, drop): ...
     def visit_computed_column(self, generated): ...
 
-class FBIdentifierPreparer(sql.compiler.IdentifierPreparer):
+class FBIdentifierPreparer(compiler.IdentifierPreparer):
     reserved_words: Any
     illegal_initial_characters: Any
     def __init__(self, dialect) -> None: ...

diff --git a/stubs/SQLAlchemy/sqlalchemy/dialects/firebird/kinterbasdb.pyi b/stubs/SQLAlchemy/sqlalchemy/dialects/firebird/kinterbasdb.pyi
@@ -1,7 +1,7 @@
 from _typeshed import Incomplete
 from typing import Any
 
-from ...types import Float, Numeric
+from ...sql.sqltypes import Float, Numeric
 from .base import FBDialect, FBExecutionContext
 
 class _kinterbasdb_numeric:

diff --git a/stubs/SQLAlchemy/sqlalchemy/dialects/mssql/base.pyi b/stubs/SQLAlchemy/sqlalchemy/dialects/mssql/base.pyi
@@ -2,12 +2,10 @@ from _typeshed import Incomplete
 from typing import Any, overload
 from typing_extensions import Literal
 
-import sqlalchemy.types as sqltypes
-
 from ...engine import default
-from ...sql import compiler
+from ...sql import compiler, sqltypes
 from ...sql.elements import Cast
-from ...types import (
+from ...sql.sqltypes import (
     BIGINT as BIGINT,
     BINARY as BINARY,
     CHAR as CHAR,

diff --git a/stubs/SQLAlchemy/sqlalchemy/dialects/mssql/information_schema.pyi b/stubs/SQLAlchemy/sqlalchemy/dialects/mssql/information_schema.pyi
@@ -1,7 +1,7 @@
 from typing import Any
 
 from ...sql import expression
-from ...types import TypeDecorator
+from ...sql.type_api import TypeDecorator
 
 ischema: Any
 

diff --git a/stubs/SQLAlchemy/sqlalchemy/dialects/mssql/json.pyi b/stubs/SQLAlchemy/sqlalchemy/dialects/mssql/json.pyi
@@ -1,4 +1,4 @@
-from ...types import JSON as _JSON
+from ...sql.sqltypes import JSON as _JSON
 
 class JSON(_JSON): ...
 

diff --git a/stubs/SQLAlchemy/sqlalchemy/dialects/mssql/pymssql.pyi b/stubs/SQLAlchemy/sqlalchemy/dialects/mssql/pymssql.pyi
@@ -1,6 +1,6 @@
 from typing import Any
 
-from ...types import Numeric
+from ...sql.sqltypes import Numeric
 from .base import MSDialect, MSIdentifierPreparer
 
 class _MSNumeric_pymssql(Numeric):

diff --git a/stubs/SQLAlchemy/sqlalchemy/dialects/mssql/pyodbc.pyi b/stubs/SQLAlchemy/sqlalchemy/dialects/mssql/pyodbc.pyi
@@ -2,7 +2,7 @@ from _typeshed import Incomplete
 from typing import Any
 
 from ...connectors.pyodbc import PyODBCConnector
-from ...types import DateTime, Float, Numeric
+from ...sql.sqltypes import DateTime, Float, Numeric
 from .base import BINARY, DATETIMEOFFSET, VARBINARY, MSDialect, MSExecutionContext
 
 class _ms_numeric_pyodbc:

diff --git a/stubs/SQLAlchemy/sqlalchemy/dialects/mysql/asyncmy.pyi b/stubs/SQLAlchemy/sqlalchemy/dialects/mysql/asyncmy.pyi
@@ -1,5 +1,7 @@
-from _typeshed import Incomplete
-from typing import Any
+from _typeshed import Incomplete, ReadableBuffer
+from collections.abc import Iterable
+from typing import Any, SupportsBytes
+from typing_extensions import SupportsIndex
 
 from ...engine import AdaptedConnection
 from .pymysql import MySQLDialect_pymysql
@@ -51,10 +53,18 @@ class AsyncAdapt_asyncmy_connection(AdaptedConnection):
 class AsyncAdaptFallback_asyncmy_connection(AsyncAdapt_asyncmy_connection):
     await_: Any
 
+def _Binary(x: Iterable[SupportsIndex] | SupportsIndex | SupportsBytes | ReadableBuffer) -> bytes: ...
+
 class AsyncAdapt_asyncmy_dbapi:
     asyncmy: Any
     pymysql: Any
     paramstyle: str
+    STRING: Incomplete
+    NUMBER: Incomplete
+    BINARY: Incomplete
+    DATETIME: Incomplete
+    TIMESTAMP: Incomplete
+    Binary = staticmethod(_Binary)
     def __init__(self, asyncmy: Any) -> None: ...
     def connect(self, *arg, **kw): ...
 

diff --git a/stubs/SQLAlchemy/sqlalchemy/dialects/mysql/base.pyi b/stubs/SQLAlchemy/sqlalchemy/dialects/mysql/base.pyi
@@ -3,9 +3,10 @@ from typing import Any
 
 from ...engine import default
 from ...sql import compiler
-from ...types import BINARY as BINARY, BLOB as BLOB, BOOLEAN as BOOLEAN, DATE as DATE, VARBINARY as VARBINARY
+from ...sql.sqltypes import BINARY as BINARY, BLOB as BLOB, BOOLEAN as BOOLEAN, DATE as DATE, VARBINARY as VARBINARY
 from .enumerated import ENUM as ENUM, SET as SET
 from .json import JSON as JSON
+from .reserved_words import RESERVED_WORDS_MARIADB as RESERVED_WORDS_MARIADB, RESERVED_WORDS_MYSQL as RESERVED_WORDS_MYSQL
 from .types import (
     BIGINT as BIGINT,
     BIT as BIT,

diff --git a/stubs/SQLAlchemy/sqlalchemy/dialects/mysql/dml.pyi b/stubs/SQLAlchemy/sqlalchemy/dialects/mysql/dml.pyi
@@ -2,7 +2,7 @@ from typing import Any
 
 from ...sql.dml import Insert as StandardInsert
 from ...sql.elements import ClauseElement
-from ...util import memoized_property
+from ...util.langhelpers import memoized_property
 
 class Insert(StandardInsert):
     stringify_dialect: str

diff --git a/stubs/SQLAlchemy/sqlalchemy/dialects/mysql/json.pyi b/stubs/SQLAlchemy/sqlalchemy/dialects/mysql/json.pyi
@@ -1,4 +1,4 @@
-import sqlalchemy.types as sqltypes
+from ...sql import sqltypes
 
 class JSON(sqltypes.JSON): ...
 

diff --git a/stubs/SQLAlchemy/sqlalchemy/dialects/mysql/mysqlconnector.pyi b/stubs/SQLAlchemy/sqlalchemy/dialects/mysql/mysqlconnector.pyi
@@ -1,6 +1,6 @@
 from typing import Any
 
-from ...util import memoized_property
+from ...util.langhelpers import memoized_property
 from .base import BIT, MySQLCompiler, MySQLDialect, MySQLIdentifierPreparer
 
 class MySQLCompiler_mysqlconnector(MySQLCompiler):

diff --git a/stubs/SQLAlchemy/sqlalchemy/dialects/mysql/mysqldb.pyi b/stubs/SQLAlchemy/sqlalchemy/dialects/mysql/mysqldb.pyi
@@ -1,7 +1,7 @@
 from _typeshed import Incomplete
 from typing import Any
 
-from ...util import memoized_property
+from ...util.langhelpers import memoized_property
 from .base import MySQLCompiler, MySQLDialect, MySQLExecutionContext
 
 class MySQLExecutionContext_mysqldb(MySQLExecutionContext):

diff --git a/stubs/SQLAlchemy/sqlalchemy/dialects/mysql/pymysql.pyi b/stubs/SQLAlchemy/sqlalchemy/dialects/mysql/pymysql.pyi
@@ -1,7 +1,7 @@
 from _typeshed import Incomplete
 from typing import Any
 
-from ...util import memoized_property
+from ...util.langhelpers import memoized_property
 from .mysqldb import MySQLDialect_mysqldb
 
 class MySQLDialect_pymysql(MySQLDialect_mysqldb):

diff --git a/stubs/SQLAlchemy/sqlalchemy/dialects/mysql/types.pyi b/stubs/SQLAlchemy/sqlalchemy/dialects/mysql/types.pyi
@@ -1,7 +1,7 @@
 from _typeshed import Incomplete
 from typing import Any
 
-import sqlalchemy.types as sqltypes
+from ...sql import sqltypes
 
 class _NumericType:
     unsigned: Any

diff --git a/stubs/SQLAlchemy/sqlalchemy/dialects/oracle/base.pyi b/stubs/SQLAlchemy/sqlalchemy/dialects/oracle/base.pyi
@@ -1,11 +1,9 @@
 from _typeshed import Incomplete
 from typing import Any
 
-from sqlalchemy.sql import ClauseElement
-
 from ...engine import default
-from ...sql import compiler, sqltypes
-from ...types import (
+from ...sql import ClauseElement, compiler, sqltypes
+from ...sql.sqltypes import (
     BLOB as BLOB,
     CHAR as CHAR,
     CLOB as CLOB,

diff --git a/stubs/SQLAlchemy/sqlalchemy/dialects/oracle/cx_oracle.pyi b/stubs/SQLAlchemy/sqlalchemy/dialects/oracle/cx_oracle.pyi
@@ -1,8 +1,7 @@
 from _typeshed import Incomplete
 from typing import Any
 
-import sqlalchemy.types as sqltypes
-
+from ...sql import sqltypes
 from . import base as oracle
 from .base import OracleCompiler, OracleDialect, OracleExecutionContext
 

diff --git a/stubs/SQLAlchemy/sqlalchemy/dialects/postgresql/array.pyi b/stubs/SQLAlchemy/sqlalchemy/dialects/postgresql/array.pyi
@@ -1,9 +1,7 @@
 from _typeshed import Incomplete
 from typing import Any as _Any
 
-import sqlalchemy.types as sqltypes
-
-from ...sql import expression
+from ...sql import expression, sqltypes
 
 def Any(other, arrexpr, operator=...): ...
 def All(other, arrexpr, operator=...): ...

diff --git a/stubs/SQLAlchemy/sqlalchemy/dialects/postgresql/asyncpg.pyi b/stubs/SQLAlchemy/sqlalchemy/dialects/postgresql/asyncpg.pyi
@@ -122,6 +122,7 @@ class AsyncAdapt_asyncpg_connection(AdaptedConnection):
     def rollback(self) -> None: ...
     def commit(self) -> None: ...
     def close(self) -> None: ...
+    def terminate(self) -> None: ...
 
 class AsyncAdaptFallback_asyncpg_connection(AsyncAdapt_asyncpg_connection):
     await_: Any
@@ -152,6 +153,7 @@ class AsyncAdapt_asyncpg_dbapi:
     TIMESTAMP: Any
     TIMESTAMP_W_TZ: Any
     TIME: Any
+    TIME_W_TZ: Incomplete
     DATE: Any
     INTERVAL: Any
     NUMBER: Any
@@ -175,6 +177,7 @@ class PGDialect_asyncpg(PGDialect):
     supports_unicode_statements: bool
     supports_server_side_cursors: bool
     supports_unicode_binds: bool
+    has_terminate: bool
     default_paramstyle: str
     supports_sane_multi_rowcount: bool
     statement_compiler: Any

diff --git a/stubs/SQLAlchemy/sqlalchemy/dialects/postgresql/base.pyi b/stubs/SQLAlchemy/sqlalchemy/dialects/postgresql/base.pyi
@@ -5,7 +5,7 @@ from ...engine import characteristics, default, reflection
 from ...schema import _CreateDropBase
 from ...sql import compiler, elements, sqltypes
 from ...sql.ddl import DDLBase
-from ...types import (
+from ...sql.sqltypes import (
     BIGINT as BIGINT,
     BOOLEAN as BOOLEAN,
     CHAR as CHAR,
@@ -179,6 +179,7 @@ class PGTypeCompiler(compiler.GenericTypeCompiler):
     def visit_INET(self, type_, **kw): ...
     def visit_CIDR(self, type_, **kw): ...
     def visit_MACADDR(self, type_, **kw): ...
+    def visit_MACADDR8(self, type_, **kw): ...
     def visit_MONEY(self, type_, **kw): ...
     def visit_OID(self, type_, **kw): ...
     def visit_REGCLASS(self, type_, **kw): ...

diff --git a/stubs/SQLAlchemy/sqlalchemy/dialects/postgresql/dml.pyi b/stubs/SQLAlchemy/sqlalchemy/dialects/postgresql/dml.pyi
@@ -3,7 +3,7 @@ from typing import Any
 
 from ...sql.dml import Insert as StandardInsert
 from ...sql.elements import ClauseElement
-from ...util import memoized_property
+from ...util.langhelpers import memoized_property
 
 class Insert(StandardInsert):
     stringify_dialect: str

diff --git a/stubs/SQLAlchemy/sqlalchemy/dialects/postgresql/hstore.pyi b/stubs/SQLAlchemy/sqlalchemy/dialects/postgresql/hstore.pyi
@@ -1,9 +1,7 @@
 from _typeshed import Incomplete
 from typing import Any
 
-import sqlalchemy.types as sqltypes
-
-from ...sql import functions as sqlfunc
+from ...sql import functions as sqlfunc, sqltypes
 
 class HSTORE(sqltypes.Indexable, sqltypes.Concatenable, sqltypes.TypeEngine):
     __visit_name__: str

diff --git a/stubs/SQLAlchemy/sqlalchemy/dialects/postgresql/json.pyi b/stubs/SQLAlchemy/sqlalchemy/dialects/postgresql/json.pyi
@@ -1,7 +1,7 @@
 from _typeshed import Incomplete
 from typing import Any
 
-import sqlalchemy.types as sqltypes
+from ...sql import sqltypes
 
 class JSONPathType(sqltypes.JSON.JSONPathType):
     def bind_processor(self, dialect): ...

diff --git a/stubs/SQLAlchemy/sqlalchemy/dialects/postgresql/pg8000.pyi b/stubs/SQLAlchemy/sqlalchemy/dialects/postgresql/pg8000.pyi
@@ -1,8 +1,7 @@
 from _typeshed import Incomplete
 from typing import Any
 
-import sqlalchemy.types as sqltypes
-
+from ...sql import sqltypes
 from .array import ARRAY as PGARRAY
 from .base import ENUM, INTERVAL, UUID, PGCompiler, PGDialect, PGExecutionContext, PGIdentifierPreparer
 from .json import JSON, JSONB, JSONPathType

diff --git a/stubs/SQLAlchemy/sqlalchemy/dialects/postgresql/psycopg2.pyi b/stubs/SQLAlchemy/sqlalchemy/dialects/postgresql/psycopg2.pyi
@@ -1,8 +1,7 @@
 from _typeshed import Incomplete
 from typing import Any
 
-import sqlalchemy.types as sqltypes
-
+from ...sql import sqltypes
 from .array import ARRAY as PGARRAY
 from .base import ENUM, UUID, PGCompiler, PGDialect, PGExecutionContext, PGIdentifierPreparer
 from .hstore import HSTORE
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,4 +7,3 @@ obsolete_since = "2.0.0" # Released on 2023-01-26

		[tool.stubtest]
		stubtest_requirements = ["pytest"]
		ignore_missing_stub = true