From 331f46554bdeec39ee842286ca550a78a1f42b1a Mon Sep 17 00:00:00 2001 From: andrey-abramow Date: Fri, 28 Sep 2018 16:45:16 +0300 Subject: [PATCH 1/3] Fix MIGRATION model indexes --- lib/models/migration.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/models/migration.json b/lib/models/migration.json index bcb9524..ec1e950 100644 --- a/lib/models/migration.json +++ b/lib/models/migration.json @@ -17,7 +17,9 @@ }, "indexes": { "name_index": { - "name": 1 + "keys": { + "name": 1 + } } }, "methods": { From d9a29128e44d087af163316f4e1d2fff442f9c30 Mon Sep 17 00:00:00 2001 From: andrey-abramow Date: Mon, 1 Oct 2018 10:37:19 +0300 Subject: [PATCH 2/3] fix(cli): up/down methods --- bin/cli | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/bin/cli b/bin/cli index 2042647..5ee028f 100755 --- a/bin/cli +++ b/bin/cli @@ -72,23 +72,17 @@ program }); program - .command('migrate ') + .command('migrate [to]') .alias('up') .description('Migrate to the given migration') .action(function(to, options){ - console.log('Migrating up to: "%s"', to); + console.log('Migrating up to: "%s"', to || 'all'); var server = program.server || process.cwd() + '/server/server.js'; var app = require(path.resolve(process.cwd(), server)); - app.models.Migration.migrate('up', to) - .then(function (res) { + app.models.Migration.migrate('up', to, ()=>{ console.log('Done.'); - }) - .catch(function (err) { - console.log(err); - }) - .finally(function () { process.exit(); - }); + }) }).on('--help', function() { console.log(' Examples:'); console.log(); @@ -98,23 +92,17 @@ program }); program - .command('rollback ') + .command('rollback [to]') .alias('down') .description('Rollback to the given migration') .action(function(to, options){ - console.log('Rolling back to: "%s"', to); + console.log('Rolling back to: "%s"', to || 'all'); var server = program.server || process.cwd() + '/server/server.js'; var app = require(path.resolve(process.cwd(), server)); - app.models.Migration.migrate('down', to) - .then(function (res) { + app.models.Migration.migrate('down', to, ()=>{ console.log('Done.'); - }) - .catch(function (err) { - console.log(err); - }) - .finally(function () { process.exit(); - }); + }) }).on('--help', function() { console.log(' Examples:'); console.log(); From c94f02dd37d7f80bc4694d6b98d4e0b9d7597064 Mon Sep 17 00:00:00 2001 From: andrey-abramow Date: Mon, 1 Oct 2018 11:00:36 +0300 Subject: [PATCH 3/3] fix(cli): use promise --- bin/cli | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/bin/cli b/bin/cli index 5ee028f..eddf1df 100755 --- a/bin/cli +++ b/bin/cli @@ -79,10 +79,15 @@ program console.log('Migrating up to: "%s"', to || 'all'); var server = program.server || process.cwd() + '/server/server.js'; var app = require(path.resolve(process.cwd(), server)); - app.models.Migration.migrate('up', to, ()=>{ + app.models.Migration.migrate('up', to) + .then(function (res) { console.log('Done.'); process.exit(); }) + .catch(function (err) { + console.log(err); + process.exit(); + }) }).on('--help', function() { console.log(' Examples:'); console.log(); @@ -99,10 +104,15 @@ program console.log('Rolling back to: "%s"', to || 'all'); var server = program.server || process.cwd() + '/server/server.js'; var app = require(path.resolve(process.cwd(), server)); - app.models.Migration.migrate('down', to, ()=>{ + app.models.Migration.migrate('down', to) + .then(function (res) { console.log('Done.'); process.exit(); }) + .catch(function (err) { + console.log(err); + process.exit(); + }) }).on('--help', function() { console.log(' Examples:'); console.log();