Merge branch 'master' into patch-1

Author: pmcnr-hx

.travis.yml

@@ -1,15 +1,13 @@
+dist: trusty
+sudo: false
 language: node_js
 node_js:
-  - "0.10"
-  - "4"
+  - 4
+  - 6
+  - 8
 services:
   - mysql
   - postgresql
-script: "npm run $TEST_STEP"
-env:
-  matrix:
-    - TEST_STEP=lint
-    - TEST_STEP=test SEQUELIZE_DIALECT=mysql
-    - TEST_STEP=test SEQUELIZE_DIALECT=postgres
+script: npm run ci
 notifications:
   email: false

CHANGELOG.md

@@ -1,3 +1,9 @@
+- 2017-09-25 - v2.0.0-alpha
+- 2017-09-25 -  :warning: GraphQL support is incomplete in this alpha release
+- 2017-09-25 - Bump all dependencies
+- 2017-09-25 - Support Node.js 8
+- 2017-09-25 - Only Node.js >= 4.5 is now supported
+- 2017-09-25 - Support latest `jsonapi-server`
 - 2016-08-09 - v1.2.8
 - 2016-08-09 - Update `sequelize` dependency to latest version
 - 2016-08-09 - Optimised searches filtered by related resource

README.md

@@ -1,3 +1,5 @@
+### :warning: !!! GraphQL support is incomplete for the current 2.0.0-alpha release !!! :warning:
+
 [![Coverage Status](https://coveralls.io/repos/holidayextras/jsonapi-store-relationaldb/badge.svg?branch=master&service=github)](https://coveralls.io/github/holidayextras/jsonapi-store-relationaldb?branch=master)
 [![Build Status](https://travis-ci.org/holidayextras/jsonapi-store-relationaldb.svg?branch=master)](https://travis-ci.org/holidayextras/jsonapi-store-relationaldb)
 [![npm version](https://badge.fury.io/js/jsonapi-store-relationaldb.svg)](http://badge.fury.io/js/jsonapi-store-relationaldb)

lib/sqlHandler.js

@@ -259,6 +259,9 @@ SqlStore.prototype._generateSearchIncludes = function(relationships) {
 
     var matchingValue = relationships[relationName];
     if (!matchingValue) return partialSearchIncludes;
+    if (typeof matchingValue === 'string') {
+      matchingValue = matchingValue.split(',')
+    }
     if (matchingValue instanceof Array) {
       matchingValue = matchingValue.filter(function(i) {
         return !(i instanceof Object);