]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
merge with main
authorYurii Karabas <1998uriyyo@gmail.com>
Fri, 1 Dec 2023 09:18:00 +0000 (11:18 +0200)
committerYurii Karabas <1998uriyyo@gmail.com>
Fri, 1 Dec 2023 09:18:00 +0000 (11:18 +0200)
1  2 
lib/sqlalchemy/engine/base.py
lib/sqlalchemy/orm/loading.py
lib/sqlalchemy/sql/_typing.py
lib/sqlalchemy/sql/elements.py
lib/sqlalchemy/sql/functions.py
lib/sqlalchemy/sql/util.py
tools/generate_sql_functions.py
tox.ini

Simple merge
Simple merge
Simple merge
index f2b779832f46ddd1800a722e5d4a25207b5cc8b6,c4e503b3cf0cf20db3d6dc430d8756da4db69c1b..de11f339d0b91304991fd5d4c7c23ad07d450ccd
@@@ -78,9 -78,9 +78,10 @@@ from ..util import HasMemoized_ro_memoi
  from ..util import TypingOnly
  from ..util.typing import Literal
  from ..util.typing import Self
 +from ..util.typing import Unpack
  
  if typing.TYPE_CHECKING:
+     from ._typing import _ByArgument
      from ._typing import _ColumnExpressionArgument
      from ._typing import _ColumnExpressionOrStrLabelArgument
      from ._typing import _InfoType
Simple merge
Simple merge
index 636a4dfcf761ab060ae9551d39f75c08e3ad13d4,348b3344845e18d820efc6cf6f2274e88c3d6974..716cb54f7ee48b92091dcb849503328271b63abd
@@@ -96,11 -182,14 +182,14 @@@ reveal_type(stmt{count}
                          fn_class.type, TypeEngine
                      ):
                          python_type = fn_class.type.python_type
 -                        python_expr = rf"Tuple\[.*{python_type.__name__}\]"
 +                        python_expr = rf".*{python_type.__name__}"
                          argspec = inspect.getfullargspec(fn_class)
-                         args = ", ".join(
-                             'column("x")' for elem in argspec.args[1:]
-                         )
+                         if fn_class.__name__ == "next_value":
+                             args = "Sequence('x_seq')"
+                         else:
+                             args = ", ".join(
+                                 'column("x")' for elem in argspec.args[1:]
+                             )
                          count += 1
  
                          buf.write(
diff --cc tox.ini
Simple merge