]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
Merge "Add PEP 646 integration" into main
authorMichael Bayer <mike_mp@zzzcomputing.com>
Wed, 24 Jan 2024 15:42:11 +0000 (15:42 +0000)
committerGerrit Code Review <gerrit@bbpush.zzzcomputing.com>
Wed, 24 Jan 2024 15:42:11 +0000 (15:42 +0000)
1  2 
lib/sqlalchemy/sql/functions.py
test/typing/plain_files/sql/functions_again.py

Simple merge
index 1919218f58d7b8ab9e1f1a5cf65720a6c6fc23d0,b5a12f24d65738082268c36a79118d177e69f14a..09e5e75f69e89a54edbb87b938e94885a0920a4a
@@@ -52,11 -52,5 +52,11 @@@ stmt2 = select
      Foo.a,
      func.coalesce(Foo.c, "a", "b"),
  ).group_by(Foo.a)
- # EXPECTED_TYPE: Select[Tuple[int, str]]
+ # EXPECTED_TYPE: Select[int, str]
  reveal_type(stmt2)
 +
 +
 +# EXPECTED_TYPE: TableValuedAlias
 +reveal_type(func.json_each().table_valued("key", "value"))
 +# EXPECTED_TYPE: TableValuedAlias
 +reveal_type(func.json_each().table_valued(Foo.a, Foo.b))