Skip to content

Commit fce6cae

Browse files
committed
Merge branch 'master' of github.com:mickhansen/graphql-sequelize
2 parents 84abdcb + ecd97e6 commit fce6cae

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ let User = sequelize.define('user', {
4141
name: Sequelize.STRING
4242
});
4343

44-
let Task = sequelize.define('user', {
44+
let Task = sequelize.define('task', {
4545
title: Sequelize.STRING
4646
});
4747

@@ -75,7 +75,7 @@ let userType = new GraphQLObjectType({
7575
description: 'The name of the user.',
7676
},
7777
tasks: {
78-
type: GraphQLList(taskType),
78+
type: new GraphQLList(taskType),
7979
resolve: resolver(User.Tasks, {
8080
separate: true // load seperately, disables auto including - default: false
8181
})

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"chai": "^3.0.0",
4040
"chai-as-promised": "^5.1.0",
4141
"eslint": "^1.7.3",
42-
"graphql": "^0.4.7",
42+
"graphql": "^0.4.13",
4343
"istanbul": "^0.4.0",
4444
"mocha": "^2.2.5",
4545
"pg": "^4.4.2",

0 commit comments

Comments
 (0)