Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ bin
.direnv
.devenv*
devenv.local.nix

.idea
Original file line number Diff line number Diff line change
@@ -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

Expand Down
6 changes: 3 additions & 3 deletions internal/endtoend/testdata/emit_pydantic_models/db/query.py
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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],
Expand Down
2 changes: 1 addition & 1 deletion internal/endtoend/testdata/emit_str_enum/db/models.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions internal/endtoend/testdata/emit_str_enum/db/query.py
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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],
Expand Down
2 changes: 1 addition & 1 deletion internal/endtoend/testdata/exec_result/python/models.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Code generated by sqlc. DO NOT EDIT.
# versions:
# sqlc v1.28.0
# sqlc v1.31.1
import dataclasses


Expand Down
2 changes: 1 addition & 1 deletion internal/endtoend/testdata/exec_result/python/query.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion internal/endtoend/testdata/exec_rows/python/models.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Code generated by sqlc. DO NOT EDIT.
# versions:
# sqlc v1.28.0
# sqlc v1.31.1
import dataclasses


Expand Down
2 changes: 1 addition & 1 deletion internal/endtoend/testdata/exec_rows/python/query.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Code generated by sqlc. DO NOT EDIT.
# versions:
# sqlc v1.28.0
# sqlc v1.31.1
import dataclasses


Expand Down
Original file line number Diff line number Diff line change
@@ -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

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Code generated by sqlc. DO NOT EDIT.
# versions:
# sqlc v1.28.0
# sqlc v1.31.1
import dataclasses


Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Code generated by sqlc. DO NOT EDIT.
# versions:
# sqlc v1.28.0
# sqlc v1.31.1
import dataclasses


Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Code generated by sqlc. DO NOT EDIT.
# versions:
# sqlc v1.28.0
# sqlc v1.31.1
import dataclasses


Expand Down
Original file line number Diff line number Diff line change
@@ -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

Expand Down
11 changes: 7 additions & 4 deletions internal/gen.go
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down