不要怂,就是干,撸起袖子干!

Commit ca49a7cd by Jan Aagaard Meier

Merge pull request #3635 from ziflex/dirname-issue

Fixed require paths to not use dirname 
2 parents 3e85d250 ffe8ae10
......@@ -3,15 +3,15 @@
var fs = require('fs')
, moment = require('moment');
var Utils = require(__dirname + '/utils')
, Migration = require(__dirname + '/migration')
, DataTypes = require(__dirname + '/data-types');
var Utils = require('./utils')
, Migration = require('./migration')
, DataTypes = require('./data-types');
module.exports = (function() {
var Migrator = function(sequelize, options) {
this.sequelize = sequelize;
this.options = Utils._.extend({
path: __dirname + '/../migrations',
path: './../migrations',
from: null,
to: null,
logging: this.sequelize.log.bind(this.sequelize),
......
'use strict';
var Utils = require(__dirname + '/utils')
var Utils = require('./utils')
, deprecatedSeen = {}
, deprecated = function(message) {
if (deprecatedSeen[message]) return;
......
'use strict';
var Utils = require(__dirname + '/utils')
var Utils = require('./utils')
, _ = require('lodash')
, DataTypes = require(__dirname + '/data-types')
, SQLiteQueryInterface = require(__dirname + '/dialects/sqlite/query-interface')
, Transaction = require(__dirname + '/transaction')
, Promise = require(__dirname + '/promise')
, DataTypes = require('./data-types')
, SQLiteQueryInterface = require('./dialects/sqlite/query-interface')
, Transaction = require('./transaction')
, Promise = require('./promise')
, QueryTypes = require('./query-types');
module.exports = (function() {
......
......@@ -405,6 +405,6 @@ Utils.fn.prototype._isSequelizeMethod =
Utils.col.prototype._isSequelizeMethod =
Utils.json.prototype._isSequelizeMethod = true;
Utils.CustomEventEmitter = require(__dirname + '/emitters/custom-event-emitter');
Utils.Promise = require(__dirname + '/promise');
Utils.QueryChainer = require(__dirname + '/query-chainer');
Utils.CustomEventEmitter = require('./emitters/custom-event-emitter');
Utils.Promise = require('./promise');
Utils.QueryChainer = require('./query-chainer');
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!