Do not overwrite cwd if knexfile and cwd is passed

bin/cli.js

@@ -87,7 +87,7 @@ async function initKnex(env, opts, useDefaultClientIfNotSpecified) {
 function invoke() {
   const filetypes = ['js', 'mjs', 'coffee', 'ts', 'eg', 'ls'];
 
-  const cwd = argv.knexfile
+  const cwd = argv.knexfile && !argv.cwd
     ? path.dirname(path.resolve(argv.knexfile))
     : process.cwd();
 

test/cli/knexfile-test.spec.js

@@ -164,23 +164,43 @@ module.exports = {
               }
             );
           });
+
+          it("does not change the process's cwd", function () {
+            return execCommand(
+              `node ${KNEX} migrate:latest --cwd=test/jake-util/knexfile --knexfile=subdir/knexfile.js`,
+              {
+                notExpectedOutput: 'Working directory changed to',
+              }
+            );
+          });
         });
 
         context('and --knexfile is an absolute path', function () {
+          // Notice: the Knexfile is using Typescript.  This means that Knex
+          // is pre-loading the appropriate Typescript modules before loading
+          // the Knexfile.
+          const knexfile = path.resolve(
+            'test/jake-util/knexfile-ts/custom-config.ts'
+          );
+          const command = `node ${KNEX} migrate:latest --cwd=test/jake-util/knexfile --knexfile=${knexfile}`;
+
           it('uses the indicated knexfile', function () {
-            // Notice: the Knexfile is using Typescript.  This means that Knex
-            // is pre-loading the appropriate Typescript modules before loading
-            // the Knexfile.
-            const knexfile = path.resolve(
-              'test/jake-util/knexfile-ts/custom-config.ts'
-            );
             return execCommand(
-              `node ${KNEX} migrate:latest --cwd=test/jake-util/knexfile --knexfile=${knexfile}`,
+              command,
               {
                 expectedOutput: 'Batch 1 run: 4 migrations',
               }
             );
           });
+
+          it("does not change the process's cwd", function () {
+            return execCommand(
+              command,
+              {
+                notExpectedOutput: 'Working directory changed to',
+              }
+            );
+          });
         });
       });
 

test/jake-util/knexfile-ts/custom-config.ts

@@ -1,13 +1,13 @@
 export const client = 'sqlite3';
 
 export const connection = {
-  filename: '../test.sqlite3',
+  filename: __dirname + '/../test.sqlite3',
 };
 
 export const migrations = {
-  directory: './knexfile_migrations',
+  directory: __dirname + '/knexfile_migrations',
 };
 
 export const seeds = {
-  directory: './knexfile_seeds',
+  directory: __dirname + '/../knexfile_seeds',
 };

test/jake-util/knexfile/subdir/knexfile.js

@@ -0,0 +1,12 @@
+module.exports = {
+  client: 'sqlite3',
+  connection: {
+    filename: __dirname + '/../../test.sqlite3',
+  },
+  migrations: {
+    directory: __dirname + '/../../knexfile_migrations',
+  },
+  seeds: {
+    directory: __dirname + '/../../knexfile_seeds',
+  },
+}