Skip to content

Commit 90f71ad

Browse files
authored
Merge pull request #2 from healx/updagrade-graphiql-examples
Upgrade&fix Graphiql and sqlalchemy examples
2 parents e7d0cca + 09be80a commit 90f71ad

File tree

7 files changed

+4328
-5189
lines changed

7 files changed

+4328
-5189
lines changed

examples/intro_sqlalchemy.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,18 @@ class BookRecord(Base):
3838
g.field("author", type=Author),
3939
))
4040

41+
4142
book_resolver = gsql.sql_table_resolver(
4243
Book,
4344
BookRecord,
4445
fields={
4546
Book.fields.title: gsql.expression(BookRecord.title),
46-
Book.fields.author: g.single(gsql.sql_join({
47-
BookRecord.author_id: AuthorRecord.id,
48-
})),
47+
Book.fields.author: lambda graph, field_query: gsql.join(
48+
key=BookRecord.author_id,
49+
resolve=lambda author_ids: graph.resolve(
50+
gsql.select(field_query.type_query).by(AuthorRecord.id, author_ids),
51+
),
52+
),
4953
},
5054
)
5155

examples/sqlalchemy/booksapp/graph/authors.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ def select_by_id(type_query, ids):
2525
Author,
2626
database.Author,
2727
fields=lambda: {
28-
Author.fields.books: gsql.join(
28+
Author.fields.books: lambda graph, field_query,: gsql.join(
2929
key=database.Author.id,
30-
resolve=lambda graph, field_query, ids: graph.resolve(
30+
resolve=lambda ids: graph.resolve(
3131
books.BookQuery.select_by_author_ids(field_query.type_query, author_ids=ids),
3232
),
3333
),

examples/sqlalchemy/booksapp/graph/books.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ def select_by_author_ids(type_query, author_ids):
2525
Book,
2626
database.Book,
2727
fields=lambda: {
28-
Book.fields.author: gsql.join(
28+
Book.fields.author: lambda graph, field_query: gsql.join(
2929
key=database.Book.author_id,
30-
resolve=lambda graph, field_query, ids: graph.resolve(
30+
resolve=lambda ids: graph.resolve(
3131
authors.AuthorQuery.select_by_id(field_query.type_query, ids=ids),
3232
),
3333
),

examples/sqlalchemy/booksapp/server.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ def graphql():
4141
finally:
4242
session.close()
4343

44-
return flask.jsonify({"data": response})
44+
return flask.jsonify({"data": response.data})

0 commit comments

Comments
 (0)