diff --git a/connect.js b/connect.js index e93d8311..1dc46748 100644 --- a/connect.js +++ b/connect.js @@ -7,8 +7,7 @@ var log = require('./lib/log'); var internals = {}; exports.connect = function(config, passedClass, callback) { - var internals = {}, - _config = config; + var internals = {}; if( config.config ) { internals = config.internals; @@ -59,7 +58,8 @@ exports.connect = function(config, passedClass, callback) { files.push(''); - db.close = function(cb) { migrationFiles(files, callback, _config, passedClass, db, oldClose, cb); }; + db.close = function(cb) { migrationFiles(files, callback, config, + internals, passedClass, db, oldClose, cb); }; db.close(); }); @@ -83,18 +83,12 @@ exports.driver = function(config, callback) { driver.connect(config, internals, callback); }; -function migrationFiles(files, callback, config, passedClass, db, close, cb) { +function migrationFiles(files, callback, config, internals, + passedClass, db, close, cb) { var file, switched = false, newConf; - var internals = {}; - var _config = config; - if( config.config ) { - internals = config.internals; - config = config.config; - } - if(files.length === 1) { db.close = close; @@ -102,6 +96,7 @@ function migrationFiles(files, callback, config, passedClass, db, close, cb) { file = files.pop(); log.info( 'Enter scope "' + ((file !== '') ? file : '/') + '"' ); + console.log(internals) if(file !== '') { diff --git a/lib/migrator.js b/lib/migrator.js index 46eed75e..9dc3d0f2 100644 --- a/lib/migrator.js +++ b/lib/migrator.js @@ -40,12 +40,9 @@ Migrator = function(driver, migrationsDir, empty, intern) { this.migrationsDir = migrationsDir; this.internals = intern; - if(intern.linked === true) { + if(intern.linked === false) { this.seedLink = new SeedLink(driver, intern); - } - else { - intern.linked = true; } diff --git a/lib/seeder.js b/lib/seeder.js index 073047e2..0a206146 100644 --- a/lib/seeder.js +++ b/lib/seeder.js @@ -70,13 +70,10 @@ Seeder = function (driver, seedsDir, versionControlled, intern) { this.seedDir = seedsDir; this.isVC = versionControlled; - if(intern.linked === true) { - - this.migrationLink = new MigrationLink(driver, intern); - } - else { + if(intern.linked === false) { intern.linked = true; + this.migrationLink = new MigrationLink(driver, intern); } internals = intern;