diff --git a/.gitignore b/.gitignore
index 60b4f3d..baddcc4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@ bin
 .direnv
 .devenv*
 devenv.local.nix
+
+.idea
diff --git a/internal/endtoend/testdata/emit_pydantic_models/db/models.py b/internal/endtoend/testdata/emit_pydantic_models/db/models.py
index 7676e5c..69c6835 100644
--- a/internal/endtoend/testdata/emit_pydantic_models/db/models.py
+++ b/internal/endtoend/testdata/emit_pydantic_models/db/models.py
@@ -1,6 +1,6 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
-#   sqlc v1.28.0
+#   sqlc v1.31.1
 import pydantic
 from typing import Optional
 
diff --git a/internal/endtoend/testdata/emit_pydantic_models/db/query.py b/internal/endtoend/testdata/emit_pydantic_models/db/query.py
index 6f5b76f..86fd5c9 100644
--- a/internal/endtoend/testdata/emit_pydantic_models/db/query.py
+++ b/internal/endtoend/testdata/emit_pydantic_models/db/query.py
@@ -1,6 +1,6 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
-#   sqlc v1.28.0
+#   sqlc v1.31.1
 # source: query.sql
 from typing import AsyncIterator, Iterator, Optional
 
@@ -103,8 +103,8 @@ async def get_author(self, *, id: int) -> Optional[models.Author]:
         )
 
     async def list_authors(self) -> AsyncIterator[models.Author]:
-        result = await self._conn.stream(sqlalchemy.text(LIST_AUTHORS))
-        async for row in result:
+        rows = (await self._conn.execute(sqlalchemy.text(LIST_AUTHORS))).all()
+        for row in rows:
             yield models.Author(
                 id=row[0],
                 name=row[1],
diff --git a/internal/endtoend/testdata/emit_str_enum/db/models.py b/internal/endtoend/testdata/emit_str_enum/db/models.py
index 5fdf754..a18335d 100644
--- a/internal/endtoend/testdata/emit_str_enum/db/models.py
+++ b/internal/endtoend/testdata/emit_str_enum/db/models.py
@@ -1,6 +1,6 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
-#   sqlc v1.28.0
+#   sqlc v1.31.1
 import dataclasses
 import enum
 from typing import Optional
diff --git a/internal/endtoend/testdata/emit_str_enum/db/query.py b/internal/endtoend/testdata/emit_str_enum/db/query.py
index 8082889..604bd66 100644
--- a/internal/endtoend/testdata/emit_str_enum/db/query.py
+++ b/internal/endtoend/testdata/emit_str_enum/db/query.py
@@ -1,6 +1,6 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
-#   sqlc v1.28.0
+#   sqlc v1.31.1
 # source: query.sql
 from typing import AsyncIterator, Iterator, Optional
 
@@ -102,8 +102,8 @@ async def get_book(self, *, id: int) -> Optional[models.Book]:
         )
 
     async def list_books(self) -> AsyncIterator[models.Book]:
-        result = await self._conn.stream(sqlalchemy.text(LIST_BOOKS))
-        async for row in result:
+        rows = (await self._conn.execute(sqlalchemy.text(LIST_BOOKS))).all()
+        for row in rows:
             yield models.Book(
                 id=row[0],
                 title=row[1],
diff --git a/internal/endtoend/testdata/exec_result/python/models.py b/internal/endtoend/testdata/exec_result/python/models.py
index 034fb2d..f4a55a5 100644
--- a/internal/endtoend/testdata/exec_result/python/models.py
+++ b/internal/endtoend/testdata/exec_result/python/models.py
@@ -1,6 +1,6 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
-#   sqlc v1.28.0
+#   sqlc v1.31.1
 import dataclasses
 
 
diff --git a/internal/endtoend/testdata/exec_result/python/query.py b/internal/endtoend/testdata/exec_result/python/query.py
index b68ce39..b86bf48 100644
--- a/internal/endtoend/testdata/exec_result/python/query.py
+++ b/internal/endtoend/testdata/exec_result/python/query.py
@@ -1,6 +1,6 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
-#   sqlc v1.28.0
+#   sqlc v1.31.1
 # source: query.sql
 import sqlalchemy
 import sqlalchemy.ext.asyncio
diff --git a/internal/endtoend/testdata/exec_rows/python/models.py b/internal/endtoend/testdata/exec_rows/python/models.py
index 034fb2d..f4a55a5 100644
--- a/internal/endtoend/testdata/exec_rows/python/models.py
+++ b/internal/endtoend/testdata/exec_rows/python/models.py
@@ -1,6 +1,6 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
-#   sqlc v1.28.0
+#   sqlc v1.31.1
 import dataclasses
 
 
diff --git a/internal/endtoend/testdata/exec_rows/python/query.py b/internal/endtoend/testdata/exec_rows/python/query.py
index 7a9b2a6..cd0c464 100644
--- a/internal/endtoend/testdata/exec_rows/python/query.py
+++ b/internal/endtoend/testdata/exec_rows/python/query.py
@@ -1,6 +1,6 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
-#   sqlc v1.28.0
+#   sqlc v1.31.1
 # source: query.sql
 import sqlalchemy
 import sqlalchemy.ext.asyncio
diff --git a/internal/endtoend/testdata/inflection_exclude_table_names/python/models.py b/internal/endtoend/testdata/inflection_exclude_table_names/python/models.py
index 8ba8803..f238065 100644
--- a/internal/endtoend/testdata/inflection_exclude_table_names/python/models.py
+++ b/internal/endtoend/testdata/inflection_exclude_table_names/python/models.py
@@ -1,6 +1,6 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
-#   sqlc v1.28.0
+#   sqlc v1.31.1
 import dataclasses
 
 
diff --git a/internal/endtoend/testdata/inflection_exclude_table_names/python/query.py b/internal/endtoend/testdata/inflection_exclude_table_names/python/query.py
index 1e1e161..09edceb 100644
--- a/internal/endtoend/testdata/inflection_exclude_table_names/python/query.py
+++ b/internal/endtoend/testdata/inflection_exclude_table_names/python/query.py
@@ -1,6 +1,6 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
-#   sqlc v1.28.0
+#   sqlc v1.31.1
 # source: query.sql
 from typing import Optional
 
diff --git a/internal/endtoend/testdata/query_parameter_limit_two/python/models.py b/internal/endtoend/testdata/query_parameter_limit_two/python/models.py
index 059675d..c02ab26 100644
--- a/internal/endtoend/testdata/query_parameter_limit_two/python/models.py
+++ b/internal/endtoend/testdata/query_parameter_limit_two/python/models.py
@@ -1,6 +1,6 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
-#   sqlc v1.28.0
+#   sqlc v1.31.1
 import dataclasses
 
 
diff --git a/internal/endtoend/testdata/query_parameter_limit_two/python/query.py b/internal/endtoend/testdata/query_parameter_limit_two/python/query.py
index e8b723e..9e61b05 100644
--- a/internal/endtoend/testdata/query_parameter_limit_two/python/query.py
+++ b/internal/endtoend/testdata/query_parameter_limit_two/python/query.py
@@ -1,6 +1,6 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
-#   sqlc v1.28.0
+#   sqlc v1.31.1
 # source: query.sql
 import sqlalchemy
 import sqlalchemy.ext.asyncio
diff --git a/internal/endtoend/testdata/query_parameter_limit_undefined/python/models.py b/internal/endtoend/testdata/query_parameter_limit_undefined/python/models.py
index 30e80db..f5fbb60 100644
--- a/internal/endtoend/testdata/query_parameter_limit_undefined/python/models.py
+++ b/internal/endtoend/testdata/query_parameter_limit_undefined/python/models.py
@@ -1,6 +1,6 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
-#   sqlc v1.28.0
+#   sqlc v1.31.1
 import dataclasses
 
 
diff --git a/internal/endtoend/testdata/query_parameter_limit_undefined/python/query.py b/internal/endtoend/testdata/query_parameter_limit_undefined/python/query.py
index 5a1fbbc..ef54438 100644
--- a/internal/endtoend/testdata/query_parameter_limit_undefined/python/query.py
+++ b/internal/endtoend/testdata/query_parameter_limit_undefined/python/query.py
@@ -1,6 +1,6 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
-#   sqlc v1.28.0
+#   sqlc v1.31.1
 # source: query.sql
 import sqlalchemy
 import sqlalchemy.ext.asyncio
diff --git a/internal/endtoend/testdata/query_parameter_limit_zero/python/models.py b/internal/endtoend/testdata/query_parameter_limit_zero/python/models.py
index 059675d..c02ab26 100644
--- a/internal/endtoend/testdata/query_parameter_limit_zero/python/models.py
+++ b/internal/endtoend/testdata/query_parameter_limit_zero/python/models.py
@@ -1,6 +1,6 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
-#   sqlc v1.28.0
+#   sqlc v1.31.1
 import dataclasses
 
 
diff --git a/internal/endtoend/testdata/query_parameter_limit_zero/python/query.py b/internal/endtoend/testdata/query_parameter_limit_zero/python/query.py
index 47bd6a9..0b4257d 100644
--- a/internal/endtoend/testdata/query_parameter_limit_zero/python/query.py
+++ b/internal/endtoend/testdata/query_parameter_limit_zero/python/query.py
@@ -1,6 +1,6 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
-#   sqlc v1.28.0
+#   sqlc v1.31.1
 # source: query.sql
 import dataclasses
 
diff --git a/internal/gen.go b/internal/gen.go
index 6e50fae..11616f3 100644
--- a/internal/gen.go
+++ b/internal/gen.go
@@ -1020,13 +1020,16 @@ func buildQueryTree(ctx *pyTmplCtx, i *importer, source string) *pyast.Node {
 				)
 				f.Returns = subscriptNode("Optional", q.Ret.Annotation())
 			case ":many":
-				stream := connMethodNode("stream", q.ConstantName, q.ArgDictNode())
 				f.Body = append(f.Body,
-					assignNode("result", poet.Await(stream)),
+					assignNode("rows", poet.Node(
+						&pyast.Call{
+							Func: poet.Attribute(poet.Await(exec), "all"),
+						},
+					)),
 					poet.Node(
-						&pyast.AsyncFor{
+						&pyast.For{
 							Target: poet.Name("row"),
-							Iter:   poet.Name("result"),
+							Iter:   poet.Name("rows"),
 							Body: []*pyast.Node{
 								poet.Expr(
 									poet.Yield(