From b36de4792bcf9b0982fc8c0e87458433f811fe92 Mon Sep 17 00:00:00 2001 From: Higor Bocutti Date: Tue, 6 Apr 2021 01:48:48 -0300 Subject: [PATCH 1/2] fix: bug #157 when try generate migration but retrieve an error like no such file --- src/commands/migration_generate.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/commands/migration_generate.js b/src/commands/migration_generate.js index 49dce724..58b9e86e 100644 --- a/src/commands/migration_generate.js +++ b/src/commands/migration_generate.js @@ -4,6 +4,11 @@ import helpers from '../helpers'; import fs from 'fs'; import clc from 'cli-color'; +const ext = { + ts: 'ts', + js: 'js' +} + exports.builder = (yargs) => _underscoreOption( _baseOptions(yargs).option('name', { @@ -15,11 +20,11 @@ exports.builder = (yargs) => exports.handler = function (args) { helpers.init.createMigrationsFolder(); - + const path = (fs.existsSync(`migrations/skeleton.${ext.ts}`))? `migrations/skeleton.${ext.ts}`:`migrations/skeleton.${ext.js}`; fs.writeFileSync( helpers.path.getMigrationPath(args.name), helpers.template.render( - 'migrations/skeleton.js', + path, {}, { beautify: false, From 95b7f24d6aaf0b80a5066b733111e870565def5c Mon Sep 17 00:00:00 2001 From: Higor Bocutti Date: Tue, 6 Apr 2021 01:48:48 -0300 Subject: [PATCH 2/2] fix: bug #157 when try generate migration but retrieve an error like no such file --- src/commands/migration_generate.js | 10 ++++- test/support/helpers.js | 70 +++++++++++++++--------------- 2 files changed, 45 insertions(+), 35 deletions(-) diff --git a/src/commands/migration_generate.js b/src/commands/migration_generate.js index 49dce724..56a010a3 100644 --- a/src/commands/migration_generate.js +++ b/src/commands/migration_generate.js @@ -4,6 +4,11 @@ import helpers from '../helpers'; import fs from 'fs'; import clc from 'cli-color'; +const ext = { + ts: 'ts', + js: 'js', +}; + exports.builder = (yargs) => _underscoreOption( _baseOptions(yargs).option('name', { @@ -15,11 +20,14 @@ exports.builder = (yargs) => exports.handler = function (args) { helpers.init.createMigrationsFolder(); + const path = fs.existsSync(`migrations/skeleton.${ext.ts}`) + ? `migrations/skeleton.${ext.ts}` + : `migrations/skeleton.${ext.js}`; fs.writeFileSync( helpers.path.getMigrationPath(args.name), helpers.template.render( - 'migrations/skeleton.js', + path, {}, { beautify: false, diff --git a/test/support/helpers.js b/test/support/helpers.js index 8861507f..853a4d55 100644 --- a/test/support/helpers.js +++ b/test/support/helpers.js @@ -27,11 +27,13 @@ module.exports = { clearDirectory: function () { return through.obj(function (file, encoding, callback) { - exec('rm -rf * & rm -rf .sequelizerc', { cwd: file.path }, function ( - err - ) { - callback(err, file); - }); + exec( + 'rm -rf * & rm -rf .sequelizerc', + { cwd: file.path }, + function (err) { + callback(err, file); + } + ); }); }, @@ -53,41 +55,41 @@ module.exports = { logToFile(command); - exec(command, { cwd: file.path, env: env }, function ( - err, - stdout, - stderr - ) { - var result = file; + exec( + command, + { cwd: file.path, env: env }, + function (err, stdout, stderr) { + var result = file; - logToFile({ err: err, stdout: stdout, stderr: stderr }); + logToFile({ err: err, stdout: stdout, stderr: stderr }); - if (stdout) { - expect(stdout).to.not.contain('EventEmitter'); - } + if (stdout) { + expect(stdout).to.not.contain('EventEmitter'); + } - if (options.pipeStdout) { - result = stdout; - } else if (options.pipeStderr) { - result = stderr; - } + if (options.pipeStdout) { + result = stdout; + } else if (options.pipeStderr) { + result = stderr; + } - if (options.exitCode) { - try { - expect(err).to.be.ok(); - expect(err.code).to.equal(1); - callback(null, result); - } catch (e) { - callback( - new Error('Expected cli to exit with a non-zero code'), - null - ); + if (options.exitCode) { + try { + expect(err).to.be.ok(); + expect(err.code).to.equal(1); + callback(null, result); + } catch (e) { + callback( + new Error('Expected cli to exit with a non-zero code'), + null + ); + } + } else { + err = options.pipeStderr ? null : err; + callback(err, result); } - } else { - err = options.pipeStderr ? null : err; - callback(err, result); } - }); + ); }); },