]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commit
Merge remote-tracking branch 'upstream/main' into feature/typevartuple
authorYurii Karabas <1998uriyyo@gmail.com>
Wed, 15 Nov 2023 13:14:22 +0000 (15:14 +0200)
committerYurii Karabas <1998uriyyo@gmail.com>
Wed, 15 Nov 2023 13:14:22 +0000 (15:14 +0200)
commit49d556de08c37f9535bdbd224e642eef01ae6db6
tree295f1efcafb5d94b3dee66747444d19ca4548e54
parent546e5348fd83504324a6e92f6546f3b58a1f2aa1
parent447cafd12df4811e4701c8b39f48a927e5414f90
Merge remote-tracking branch 'upstream/main' into feature/typevartuple

# Conflicts:
# lib/sqlalchemy/orm/query.py
# lib/sqlalchemy/orm/scoping.py
# lib/sqlalchemy/orm/session.py
# lib/sqlalchemy/sql/_selectable_constructors.py
# lib/sqlalchemy/sql/dml.py
# tools/generate_tuple_map_overloads.py
lib/sqlalchemy/orm/query.py
lib/sqlalchemy/orm/scoping.py
lib/sqlalchemy/orm/session.py
lib/sqlalchemy/sql/_selectable_constructors.py
lib/sqlalchemy/sql/dml.py
lib/sqlalchemy/sql/elements.py
lib/sqlalchemy/sql/selectable.py
tools/generate_tuple_map_overloads.py