merge with upstream/main

diff --cc lib/sqlalchemy/engine/base.py
index cd71fe26397115a966d72ead42ce78b4d26c62b5,dcce3ed342b17a45453178f24e17a1f099098d4e..2706bbe0ee7b2f7e4dff9c71578c72c9571181f9
--- 1/lib/sqlalchemy/engine/base.py
--- 2/lib/sqlalchemy/engine/base.py
+++ b/lib/sqlalchemy/engine/base.py
@@@ -1499,10 -1495,10 +1499,10 @@@ class Connection(ConnectionEventsTarget
          ddl: ExecutableDDLElement,
          distilled_parameters: _CoreMultiExecuteParams,
          execution_options: CoreExecuteOptionsParameter,
 -    ) -> CursorResult[Any]:
 +    ) -> CursorResult[Unpack[TupleAny]]:
          """Execute a schema.DDL object."""
  
-         execution_options = ddl._execution_options.merge_with(
+         exec_opts = ddl._execution_options.merge_with(
              self._execution_options, execution_options
          )
  

diff --cc lib/sqlalchemy/engine/cursor.py
Simple merge

diff --cc lib/sqlalchemy/engine/default.py
index cb9a6f2dfd2a57b7e830e4dab6c7d899f9ad6c4e,213a047711eb84b601ff5d2da05d4a86de598f91..3ef7f5790282d02112664eed512c7252f87be173
--- 1/lib/sqlalchemy/engine/default.py
--- 2/lib/sqlalchemy/engine/default.py
+++ b/lib/sqlalchemy/engine/default.py
@@@ -64,11 -65,7 +65,10 @@@ from ..sql.compiler import DDLCompile
  from ..sql.compiler import InsertmanyvaluesSentinelOpts
  from ..sql.compiler import SQLCompiler
  from ..sql.elements import quoted_name
- from ..util.typing import Final
  from ..util.typing import Literal
 +from ..util.typing import TupleAny
 +from ..util.typing import Unpack
 +
  
  if typing.TYPE_CHECKING:
      from types import ModuleType

diff --cc lib/sqlalchemy/engine/events.py
Simple merge

diff --cc lib/sqlalchemy/engine/result.py
Simple merge

diff --cc lib/sqlalchemy/engine/row.py
Simple merge

diff --cc lib/sqlalchemy/ext/asyncio/engine.py
Simple merge

diff --cc lib/sqlalchemy/ext/asyncio/result.py
Simple merge

diff --cc lib/sqlalchemy/ext/asyncio/scoping.py
Simple merge

diff --cc lib/sqlalchemy/ext/asyncio/session.py
Simple merge

diff --cc lib/sqlalchemy/ext/horizontal_shard.py
index 2d0c884943052ebd96db0ab487bade675e5a2a72,24060a062e1334e513efd3b935adfff64e8003d8..e6d1b0406f76acf7ef6332f0dec04aedda2d0936
--- 1/lib/sqlalchemy/ext/horizontal_shard.py
--- 2/lib/sqlalchemy/ext/horizontal_shard.py
+++ b/lib/sqlalchemy/ext/horizontal_shard.py
@@@ -48,11 -49,7 +49,10 @@@ from ..orm.query import Quer
  from ..orm.session import _BindArguments
  from ..orm.session import _PKIdentityArgument
  from ..orm.session import Session
- from ..util.typing import Protocol
  from ..util.typing import Self
 +from ..util.typing import TypeVarTuple
 +from ..util.typing import Unpack
 +
  
  if TYPE_CHECKING:
      from ..engine.base import Connection

diff --cc lib/sqlalchemy/orm/bulk_persistence.py
Simple merge

diff --cc lib/sqlalchemy/orm/context.py
Simple merge

diff --cc lib/sqlalchemy/orm/descriptor_props.py
Simple merge

diff --cc lib/sqlalchemy/orm/interfaces.py
index 92676e1f731276d51884cd4d52fe9b194bf424b7,5cab1d348c247e01b81102864decff83b63a90b6..dd9e558cd3069f11b819397cc4588507321004fe
--- 1/lib/sqlalchemy/orm/interfaces.py
--- 2/lib/sqlalchemy/orm/interfaces.py
+++ b/lib/sqlalchemy/orm/interfaces.py
@@@ -71,10 -72,6 +72,9 @@@ from ..sql.schema import Colum
  from ..sql.type_api import TypeEngine
  from ..util import warn_deprecated
  from ..util.typing import RODescriptorReference
- from ..util.typing import TypedDict
 +from ..util.typing import TupleAny
 +from ..util.typing import Unpack
 +
  
  if typing.TYPE_CHECKING:
      from ._typing import _EntityType

diff --cc lib/sqlalchemy/orm/loading.py
Simple merge

diff --cc lib/sqlalchemy/orm/mapper.py
Simple merge

diff --cc lib/sqlalchemy/orm/query.py
Simple merge

diff --cc lib/sqlalchemy/orm/scoping.py
index 75171efecd42135b9ff6d349bb0186c183fe150e,ead18d1862dced1a36dfc49f410cab425684c1a4..2e87f41879e83a39ef745f1888ebecab1ad85b21
--- 1/lib/sqlalchemy/orm/scoping.py
--- 2/lib/sqlalchemy/orm/scoping.py
+++ b/lib/sqlalchemy/orm/scoping.py
@@@ -31,10 -32,6 +32,9 @@@ from ..util import ScopedRegistr
  from ..util import ThreadLocalRegistry
  from ..util import warn
  from ..util import warn_deprecated
- from ..util.typing import Protocol
 +from ..util.typing import TupleAny
 +from ..util.typing import TypeVarTuple
 +from ..util.typing import Unpack
  
  if TYPE_CHECKING:
      from ._typing import _EntityType

diff --cc lib/sqlalchemy/orm/session.py
index eb45fb9dbb70bc6476ecfe965e96e10f54050ebe,26c907446e75372d29f6afb693ea284c7ad85bd0..4315ac7f3005d24d319f517caa184dbd2a74a4a0
--- 1/lib/sqlalchemy/orm/session.py
--- 2/lib/sqlalchemy/orm/session.py
+++ b/lib/sqlalchemy/orm/session.py
@@@ -90,11 -91,6 +91,10 @@@ from ..sql.selectable import ForUpdateA
  from ..sql.selectable import LABEL_STYLE_TABLENAME_PLUS_COL
  from ..util import IdentitySet
  from ..util.typing import Literal
- from ..util.typing import Protocol
 +from ..util.typing import TupleAny
 +from ..util.typing import TypeVarTuple
 +from ..util.typing import Unpack
 +
  
  if typing.TYPE_CHECKING:
      from ._typing import _EntityType

diff --cc lib/sqlalchemy/orm/state.py
index 83f85cda276fdfd2dc1e00da1c7bec9e1cccb1f7,786b55e14951acf1f5303140aca13a7942a8d09a..234a028a1529f56a67e28db51248b1af68bcbeb1
--- 1/lib/sqlalchemy/orm/state.py
--- 2/lib/sqlalchemy/orm/state.py
+++ b/lib/sqlalchemy/orm/state.py
@@@ -45,9 -46,6 +46,8 @@@ from .. import exc as sa_ex
  from .. import inspection
  from .. import util
  from ..util.typing import Literal
- from ..util.typing import Protocol
 +from ..util.typing import TupleAny
 +from ..util.typing import Unpack
  
  if TYPE_CHECKING:
      from ._typing import _IdentityKeyType

diff --cc lib/sqlalchemy/orm/util.py
index d834435c4758be76bff6700bc3fc294bec27bfaf,89d5ad491ce2f50c5eae924b525d91fdea0d8a55..4309cb119e27afa1d3fbe2cbb21a96b427d023b4
--- 1/lib/sqlalchemy/orm/util.py
--- 2/lib/sqlalchemy/orm/util.py
+++ b/lib/sqlalchemy/orm/util.py
@@@ -91,10 -92,7 +92,9 @@@ from ..util.typing import 
  from ..util.typing import eval_name_only as _eval_name_only
  from ..util.typing import is_origin_of_cls
  from ..util.typing import Literal
- from ..util.typing import Protocol
 +from ..util.typing import TupleAny
  from ..util.typing import typing_get_origin
 +from ..util.typing import Unpack
  
  if typing.TYPE_CHECKING:
      from ._typing import _EntityType

diff --cc lib/sqlalchemy/orm/writeonly.py
Simple merge

diff --cc lib/sqlalchemy/sql/_selectable_constructors.py
Simple merge

diff --cc lib/sqlalchemy/sql/_typing.py
index bb0ac7dbcf617c267359c455a7e18f362e2e6648,f5f6fb1775b7ae9854bd0e7f9b8c7d01edb63541..5e40f19cce250dc27fb898ee857b6c00a894ad38
--- 1/lib/sqlalchemy/sql/_typing.py
--- 2/lib/sqlalchemy/sql/_typing.py
+++ b/lib/sqlalchemy/sql/_typing.py
@@@ -16,7 -17,9 +17,8 @@@ from typing import Mappin
  from typing import NoReturn
  from typing import Optional
  from typing import overload
+ from typing import Protocol
  from typing import Set
 -from typing import Tuple
  from typing import Type
  from typing import TYPE_CHECKING
  from typing import TypeVar
@@@ -27,10 -30,7 +29,9 @@@ from .. import ex
  from .. import util
  from ..inspection import Inspectable
  from ..util.typing import Literal
- from ..util.typing import Protocol
 +from ..util.typing import TupleAny
  from ..util.typing import TypeAlias
 +from ..util.typing import Unpack
  
  if TYPE_CHECKING:
      from datetime import date

diff --cc lib/sqlalchemy/sql/compiler.py
index 49fb4eb231cc1ab4cc2d166025a0ffd0c657cfd5,2d6f33063162cb76cc50ca65d3bb54964e24266f..ea19e9a86dc6483fae93b0802b93ba79f9dfe621
--- 1/lib/sqlalchemy/sql/compiler.py
--- 2/lib/sqlalchemy/sql/compiler.py
+++ b/lib/sqlalchemy/sql/compiler.py
@@@ -86,10 -88,6 +88,8 @@@ from .. import ex
  from .. import util
  from ..util import FastIntFlag
  from ..util.typing import Literal
- from ..util.typing import Protocol
 +from ..util.typing import TupleAny
- from ..util.typing import TypedDict
 +from ..util.typing import Unpack
  
  if typing.TYPE_CHECKING:
      from .annotation import _AnnotationDict

diff --cc lib/sqlalchemy/sql/dml.py
Simple merge

diff --cc lib/sqlalchemy/sql/elements.py
Simple merge

diff --cc lib/sqlalchemy/sql/functions.py
Simple merge

diff --cc lib/sqlalchemy/sql/selectable.py
index 3d070e968fb3647bb2333ac8be0a481f1eab47c1,7e3c7150cfa3ed56793dd5d82b92c2ead6fd42aa..e16cd61b8c244016d074815b80fea0da06899f73
--- 1/lib/sqlalchemy/sql/selectable.py
--- 2/lib/sqlalchemy/sql/selectable.py
+++ b/lib/sqlalchemy/sql/selectable.py
@@@ -97,12 -99,7 +98,11 @@@ from .. import ex
  from .. import util
  from ..util import HasMemoized_ro_memoized_attribute
  from ..util.typing import Literal
- from ..util.typing import Protocol
  from ..util.typing import Self
 +from ..util.typing import TupleAny
 +from ..util.typing import TypeVarTuple
 +from ..util.typing import Unpack
 +
  
  and_ = BooleanClauseList.and_
  

diff --cc lib/sqlalchemy/sql/sqltypes.py
Simple merge

diff --cc lib/sqlalchemy/sql/util.py
index 9df7b7cabd1cc4fdb71513c24c7fbcfe31667178,ac8b30eb3174d38f411d5281bf4ba3dc290e1c2f..53e5726722bcd4d2c1e35a7ae4af0d022817b6f9
--- 1/lib/sqlalchemy/sql/util.py
--- 2/lib/sqlalchemy/sql/util.py
+++ b/lib/sqlalchemy/sql/util.py
@@@ -69,8 -70,6 +70,7 @@@ from .visitors import _E
  from .. import exc
  from .. import util
  from ..util.typing import Literal
- from ..util.typing import Protocol
 +from ..util.typing import Unpack
  
  if typing.TYPE_CHECKING:
      from ._typing import _EquivalentColumnMap

diff --cc lib/sqlalchemy/util/typing.py
index 996c53eb137aa7f54633d726dbe4fe359a126e9c,ce3aa9fe321b2260c492012d2ed6a59a70fba6e1..a3e9397640297f66fed142e413c155184deb6ba6
--- 1/lib/sqlalchemy/util/typing.py
--- 2/lib/sqlalchemy/util/typing.py
+++ b/lib/sqlalchemy/util/typing.py
@@@ -39,22 -40,17 +40,20 @@@ if True:  # zimports removes the tailin
      from typing_extensions import (
          dataclass_transform as dataclass_transform,  # 3.11,
      )
-     from typing_extensions import Final as Final  # 3.8
-     from typing_extensions import final as final  # 3.8
      from typing_extensions import get_args as get_args  # 3.10
      from typing_extensions import get_origin as get_origin  # 3.10
-     from typing_extensions import Literal as Literal  # 3.8
+     from typing_extensions import (
+         Literal as Literal,
+     )  # 3.8 but has bugs before 3.10
      from typing_extensions import NotRequired as NotRequired  # 3.11
      from typing_extensions import ParamSpec as ParamSpec  # 3.10
-     from typing_extensions import Protocol as Protocol  # 3.8
-     from typing_extensions import SupportsIndex as SupportsIndex  # 3.8
      from typing_extensions import TypeAlias as TypeAlias  # 3.10
-     from typing_extensions import TypedDict as TypedDict  # 3.8
      from typing_extensions import TypeGuard as TypeGuard  # 3.10
 +    from typing_extensions import TypeVarTuple as TypeVarTuple  # 3.11
      from typing_extensions import Self as Self  # 3.11
+     from typing_extensions import TypeAliasType as TypeAliasType  # 3.12
 +    from typing_extensions import Unpack as Unpack  # 3.11
 +
  
  _T = TypeVar("_T", bound=Any)
  _KT = TypeVar("_KT")

diff --cc tools/generate_sql_functions.py
Simple merge

diff --cc tox.ini
Simple merge