mysql support (#255)

* travis: node@6 and cache `node_modules`

* test: rewrite helper

* test: run tests on mysql

* test: mysql: prepare tests

* mysql: fix limit: should be a integer

* test: relay: test for all dialect

* relay: full_count for mysql

* test: mysql: fix order by

* test: relay: fix random failing

Author: LoicMahieu

.travis.yml

@@ -1,13 +1,27 @@
-language: node_js
+sudo: false
 
+language: node_js
 node_js:
   - "4.0"
+  - "6.0"
+
+cache:
+  directories:
+    - node_modules
+
+env:
+  - DIALECT=mysql
+  - DIALECT=postgres
 
+services:
+  - mysql
 addons:
   postgresql: "9.4"
 
 before_script:
-  - psql -c 'create database graphql_sequelize_test;' -U postgres
+  - if [[ "$DIALECT" == "postgres" ]]; then psql -c "drop database if exists test;" -U postgres; fi
+  - if [[ "$DIALECT" == "postgres" ]]; then psql -c "create database test;" -U postgres; fi
+  - if [[ "$DIALECT" == "mysql" ]]; then mysql -e "create database IF NOT EXISTS test;" -uroot; fi
 
 script:
   - "npm run check && npm run test-integration"

docker-compose.yml

@@ -1,16 +1,23 @@
 dev:
   build: .
   links:
-  - db
+  - postgres
+  - mysql
   volumes:
   - .:/src/graphql-sequelize
   environment:
-    DB_DATABASE: graphql_sequelize_test
-    DB_USER: graphql_sequelize_test
-    DB_PASSWORD: graphql_sequelize_test
+    DIALECT: "${DIALECT}"
 
-db:
+postgres:
   image: postgres:9.4
   environment:
     POSTGRES_USER: graphql_sequelize_test
-    POSTGRES_PASSWORD: graphql_sequelize_test
+    POSTGRES_PASSWORD: graphql_sequelize_test
+
+mysql:
+  image: mysql:5.6
+  environment:
+    MYSQL_USER: test
+    MYSQL_PASSWORD: test
+    MYSQL_DATABASE: test
+    MYSQL_ALLOW_EMPTY_PASSWORD: 1

package.json

@@ -15,7 +15,7 @@
     "test-watch": "npm run test-unit -- --watch",
     "test-unit": "mocha $npm_package_options_mocha test/unit/*.test.js test/unit/**/*.test.js",
     "build-docker": "docker-compose build",
-    "test-docker": "docker-compose run dev /bin/sh -c \"npm run test-integration\"",
+    "test-docker": "DIALECT=${DIALECT:=postgres} docker-compose run dev /bin/sh -c \"npm run test-integration\"",
     "test-integration": "mocha $npm_package_options_mocha test/integration/*.test.js test/integration/**/*.test.js"
   },
   "repository": {
@@ -51,8 +51,10 @@
     "chai": "^3.0.0",
     "chai-as-promised": "^5.1.0",
     "eslint": "^1.7.3",
+    "graphql": "^0.6.0",
     "istanbul": "^0.4.0",
     "mocha": "^2.2.5",
+    "mysql": "^2.11.1",
     "pg": "^5.0.0",
     "pg-hstore": "^2.3.2",
     "sequelize": "^3.16.0",

src/argsToFindOptions.js

@@ -12,11 +12,11 @@ export default function argsToFindOptions(args, target) {
       }
 
       if (key === 'limit' && args[key]) {
-        result.limit = args[key];
+        result.limit = parseInt(args[key], 10);
       }
 
       if (key === 'offset' && args[key]) {
-        result.offset = args[key];
+        result.offset = parseInt(args[key], 10);
       }
 
       if (key === 'order' && args[key]) {

src/generateIncludes.js

@@ -86,6 +86,10 @@ export default function generateIncludes(simpleAST, type, context, options) {
 
         let separate = includeOptions.limit && association.associationType === 'HasMany';
 
+        if (includeOptions.limit) {
+          includeOptions.limit = parseInt(includeOptions.limit, 10);
+        }
+
         if (include && (!includeOptions.limit || separate)) {
           if (includeOptions.order && !separate) {
             includeOptions.order.map(function (order) {

src/relay.js

@@ -247,7 +247,7 @@ export function sequelizeConnection({name, nodeType, target, orderBy: orderByEnu
       options.attributes = _.uniq(options.attributes);
       return before(options, args, context, info);
     },
-    after: function (values, args, context, {source}) {
+    after: async function (values, args, context, {source}) {
       var cursor = null;
 
       if (args.after || args.before) {
@@ -265,9 +265,14 @@ export function sequelizeConnection({name, nodeType, target, orderBy: orderByEnu
       if (!values[0]) {
         fullCount = 0;
       }
-      if (model.sequelize.dialect.name === 'postgres' && (args.first || args.last)) {
-        if (fullCount === null || fullCount === undefined) throw new Error('No fullcount available');
+
+      if ((args.first || args.last) && (fullCount === null || fullCount === undefined)) {
+        // In case of `OVER()` is not available, we need to get the full count from a second query.
+        fullCount = await model.count({
+          where: argsToWhere(args)
+        });
       }
+
       let hasNextPage = false;
       let hasPreviousPage = false;
       if (args.first || args.last) {

test/helper.js

@@ -1,12 +1,11 @@
 'use strict';
 
+import { sequelize, Promise, beforeRemoveAllTables } from '../support/helper'
+
 var chai = require('chai')
   , expect = chai.expect
   , resolver = require('../../src/resolver')
-  , helper = require('./helper')
-  , sequelize = helper.sequelize
   , Sequelize = require('sequelize')
-  , Promise = helper.Promise
   , sinon = require('sinon')
   , attributeFields = require('../../src/attributeFields')
   , _ = require('lodash');
@@ -52,6 +51,8 @@ const generateCustom = Promise.method(id => {
 });
 
 describe('relay', function () {
+  beforeRemoveAllTables();
+
   var User
     , Task
     , userType
@@ -264,7 +265,7 @@ describe('relay', function () {
       , projectId = 1
       , taskId = 1;
 
-    return this.sequelize.sync({force: true}).bind(this).then(function () {
+    return sequelize.sync({force: true}).bind(this).then(function () {
       return Promise.join(
         Project.create({
           id: projectId++,