knex 0.21.17 → 0.21.21

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Master (Unreleased)
 
+# 0.21.21 - 10 August, 2021
+
+### Bug fixes:
+
+- CLI: Fix line terminators causing knex migrations to fail
+
+# 0.21.20 - 07 August, 2021
+
+### Typings:
+
+- Added option to mssql connection configuration for trustServerCertificate boolean #4606
+
+# 0.21.19 - 02 March, 2021
+
+- SQLite: Made the constraint detection case-insensitive #4332
+
+# 0.21.18 - 22 February, 2021
+
+- CLI: Fix an issue with npm@7 and ESM when type was set to 'module' in package.json #4295
+
 # 0.21.17 - 30 January, 2021
 
 ### Bug fixes:

package/lib/dialects/mssql/index.js

@@ -110,6 +110,8 @@ Object.assign(Client_MSSQL.prototype, {
         cfg.options.rowCollectionOnRequestCompletion = false;
         cfg.options.useColumnNames = false;
         cfg.options.appName = cfg.options.appName || 'node-mssql';
+        cfg.options.trustServerCertificate =
+          cfg.options.trustServerCertificate || false;
 
         // tedious always connect via tcp when port is specified
         if (cfg.options.instanceName) delete cfg.options.port;

package/lib/dialects/sqlite3/schema/ddl.js

@@ -333,8 +333,8 @@ assign(SQLite3_DDL.prototype, {
           .map((line) => line.trim())
           .filter((defLine) => {
             if (
-              defLine.startsWith('constraint') === false &&
-              defLine.includes('foreign key') === false
+              defLine.toLowerCase().startsWith('constraint') === false &&
+              defLine.toLowerCase().includes('foreign key') === false
             )
               return true;
 

package/lib/migrate/Migrator.js

@@ -80,12 +80,16 @@ class Migrator {
 
     const transactionForAll =
       !this.config.disableTransactions &&
-      !migrations.some((migration) => {
-        const migrationContents = this.config.migrationSource.getMigration(
-          migration
-        );
-        return !this._useTransaction(migrationContents);
-      });
+      !(
+        await Promise.all(
+          migrations.map(async (migration) => {
+            const migrationContents = await this.config.migrationSource.getMigration(
+              migration
+            );
+            return !this._useTransaction(migrationContents);
+          })
+        )
+      ).some((isTransactionUsed) => isTransactionUsed);
 
     if (transactionForAll) {
       return this.knex.transaction((trx) => {
@@ -133,6 +137,16 @@ class Migrator {
           migrationToRun = newMigrations[0];
         }
 
+        return {
+          migrationToRun,
+          useTransaction:
+            !migrationToRun ||
+            this._useTransaction(
+              this.config.migrationSource.getMigration(migrationToRun)
+            ),
+        };
+      })
+      .then(({ migrationToRun, useTransaction }) => {
         const migrationsToRun = [];
         if (migrationToRun) {
           migrationsToRun.push(migrationToRun);
@@ -140,10 +154,7 @@ class Migrator {
 
         const transactionForAll =
           !this.config.disableTransactions &&
-          (!migrationToRun ||
-            this._useTransaction(
-              this.config.migrationSource.getMigration(migrationToRun)
-            ));
+          (!migrationToRun || useTransaction);
 
         if (transactionForAll) {
           return this.knex.transaction((trx) => {

package/lib/util/import-file.js

@@ -1,5 +1,4 @@
-// When run via npm, we can leverage the injected environment variables to infer the import type
-const isTypeModule = process.env.npm_package_type === 'module'
+const isModuleType = require('./is-module-type');
 
 /**
  * imports 'mjs', else requires.
@@ -7,8 +6,8 @@ const isTypeModule = process.env.npm_package_type === 'module'
  * @param {string} filepath
  * @todo WARN on version 10 and '--experimental-modules' and '--esm'
  */
-module.exports = function importFile(filepath) {
-  return isTypeModule || filepath.endsWith('.mjs')
+module.exports = async function importFile(filepath) {
+  return (await isModuleType(filepath))
     ? import(require('url').pathToFileURL(filepath))
     : require(filepath);
 };

package/lib/util/is-module-type.js

@@ -0,0 +1,14 @@
+const { readFile } = require('./fs');
+
+module.exports = async function isModuleType(filepath) {
+  if (process.env.npm_package_json) {
+    // npm >= 7.0.0
+    const packageJson = JSON.parse(
+      await readFile(process.env.npm_package_json, 'utf-8')
+    );
+    if (packageJson.type === 'module') {
+      return true;
+    }
+  }
+  return process.env.npm_package_type === 'module' || filepath.endsWith('.mjs');
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "knex",
-  "version": "0.21.17",
+  "version": "0.21.21",
   "description": "A batteries-included SQL query & schema builder for Postgres, MySQL and SQLite3 and the Browser",
   "main": "knex.js",
   "types": "types/index.d.ts",
@@ -83,10 +83,10 @@
     ]
   },
   "devDependencies": {
-    "@types/node": "^14.14.12",
-    "chai": "^4.2.0",
+    "@types/node": "^16.4.13",
+    "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
-    "chai-subset-in-order": "^2.1.4",
+    "chai-subset-in-order": "^2.2.1",
     "cli-testlab": "^2.1.1",
     "coveralls": "^3.1.0",
     "cross-env": "^7.0.3",
@@ -98,23 +98,23 @@
     "jake": "^8.1.1",
     "JSONStream": "^1.3.5",
     "lint-staged": "^10.5.3",
-    "mocha": "^8.2.1",
+    "mocha": "^8.4.0",
     "mock-fs": "^4.13.0",
-    "mssql": "^6.3.0",
+    "mssql": "^6.3.2",
     "mysql": "^2.18.1",
-    "mysql2": "^2.2.5",
+    "mysql2": "^2.3.0",
     "nyc": "^15.1.0",
     "oracledb": "^5.1.0",
-    "pg": "^8.5.1",
+    "pg": "^8.7.1",
     "pg-query-stream": "^3.4.2",
     "prettier": "2.2.1",
     "rimraf": "^3.0.2",
-    "sinon": "^9.2.2",
+    "sinon": "^9.2.4",
     "sinon-chai": "^3.5.0",
     "source-map-support": "^0.5.19",
-    "sqlite3": "^5.0.0",
+    "sqlite3": "^5.0.2",
     "tap-spec": "^5.0.0",
-    "tape": "^5.0.1",
+    "tape": "^5.3.1",
     "toxiproxy-node-client": "^2.0.6",
     "ts-node": "^9.1.1",
     "tsd": "^0.14.0",

package/types/index.d.ts

@@ -1928,6 +1928,7 @@ declare namespace Knex {
       maxRetriesOnTransientErrors?: number;
       multiSubnetFailover?: boolean;
       packetSize?: number;
+      trustServerCertificate?: boolean;
     }>;
     pool?: Readonly<{
       min?: number;