Merge branch 'sequelize-promise' of https://github.com/schmod/sequeli…

…ze-fixtures into schmod-sequelize-promise
domasx2 · Jan 13, 2019 · 78606f1 · 78606f1
2 parents 7d6d4b6 + c2fb6b8
commit 78606f1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/lib/Promise.js b/lib/Promise.js
@@ -0,0 +1,9 @@
+var Promise;
+try {
+  Promise = require('sequelize').Promise;
+  if (!Promise) throw new Error();
+} catch (err) {
+  Promise = require('bluebird');
+}
+
+module.exports = Promise;
diff --git a/lib/loader.js b/lib/loader.js
@@ -1,4 +1,4 @@
-var Promise = require('bluebird');
+var Promise = require('./Promise');
 var objectAssign = require('object-assign');
 var Op = require('sequelize').Op;
 

diff --git a/lib/reader.js b/lib/reader.js
@@ -1,4 +1,4 @@
-var Promise = require('bluebird'),
+var Promise = require('./Promise'),
     path    = require('path'),
     yaml    = require('js-yaml'),
     glob    = Promise.promisify(require('glob')),