knex 2.5.1 → 3.0.1

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Master (Unreleased)
 
+# 3.0.0 - 6 October, 2023
+
+- Build fix
+
+# 3.0.0 - 6 October, 2023
+
+- Fix raw bindings typing (#5401)
+- Fix migrate:unlock when used with custom identifier wrapping. (#5353)
+- Fix driver options specified with .options() method being ignored for oracledb dialect (#5123)
+- Drop compatibility for Node < 16
+- Fix knex d.ts to work with mixed modules (#5659)
+- Fix Lexical error from "Instaed" to "Instead" (#5655)
+
+### Bug fixes
+
+- Fix Linting #5455 - #5460
+
 # 2.5.1 - 12 July, 2023
 
 ### Bug fixes
@@ -1495,7 +1512,7 @@ Note: there are many breaking changes in this version, particularly in TypeScrip
 - Drop support for strong-oracle #2487
 - Timeout errors doesn't silently ignore the passed errors anymore #2626
 - Removed WebSQL dialect #2647
-- Various fixes to mssql dialect to make it compatible with other dialects #2653, Unique constraint now allow multiple null values, float type is now float instaed of decimal, rolling back transaction with undefined rejects with Error, select for update and select for share actually locks selected row, so basically old schema migrations will work a lot different and produce different schema like before. Also now MSSQL is included in CI tests.
+- Various fixes to mssql dialect to make it compatible with other dialects #2653, Unique constraint now allow multiple null values, float type is now float instead of decimal, rolling back transaction with undefined rejects with Error, select for update and select for share actually locks selected row, so basically old schema migrations will work a lot different and produce different schema like before. Also now MSSQL is included in CI tests.
 
 ### Bug fixes:
 

package/LICENSE

@@ -1,22 +1,22 @@
-Copyright (c) 2013-present Tim Griesser
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
+Copyright (c) 2013-present Tim Griesser
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.

package/lib/dialects/oracledb/index.js

@@ -170,7 +170,7 @@ class Client_Oracledb extends Client_Oracle {
   _query(connection, obj) {
     if (!obj.sql) throw new Error('The query is empty');
 
-    const options = { autoCommit: false };
+    const options = Object.assign({}, obj.options, { autoCommit: false });
     if (obj.method === 'select') {
       options.resultSet = true;
     }

package/lib/migrations/migrate/Migrator.js

@@ -294,6 +294,7 @@ class Migrator {
   }
 
   async forceFreeMigrationsLock(config) {
+    this._disableProcessing();
     this.config = getMergedConfig(config, this.config, this.knex.client.logger);
     const { schemaName, tableName } = this.config;
     const lockTableName = getLockTableName(tableName);

package/lib/migrations/migrate/stub/cjs.stub

@@ -1,15 +1,15 @@
-
-exports.up = function(knex) {
-  <% if (d.tableName) { %>
-  return knex.schema.createTable("<%= d.tableName %>", function(t) {
-    t.increments();
-    t.timestamp();
-  });
-  <% } %>
-};
-
-exports.down = function(knex) {
-  <% if (d.tableName) { %>
-  return knex.schema.dropTable("<%= d.tableName %>");
-  <% } %>
-};
+
+exports.up = function(knex) {
+  <% if (d.tableName) { %>
+  return knex.schema.createTable("<%= d.tableName %>", function(t) {
+    t.increments();
+    t.timestamp();
+  });
+  <% } %>
+};
+
+exports.down = function(knex) {
+  <% if (d.tableName) { %>
+  return knex.schema.dropTable("<%= d.tableName %>");
+  <% } %>
+};

package/lib/migrations/migrate/stub/coffee.stub

@@ -1,13 +1,13 @@
-
-exports.up = (knex) ->
-  <% if (d.tableName) { %>
-  knex.schema.createTable "<%= d.tableName %>", (t) ->
-    t.increments()
-    t.timestamp()
-  <% } %>
-
-
-exports.down = (knex) ->
-  <% if (d.tableName) { %>
-  knex.schema.dropTable "<%= d.tableName %>"
-  <% } %>
+
+exports.up = (knex) ->
+  <% if (d.tableName) { %>
+  knex.schema.createTable "<%= d.tableName %>", (t) ->
+    t.increments()
+    t.timestamp()
+  <% } %>
+
+
+exports.down = (knex) ->
+  <% if (d.tableName) { %>
+  knex.schema.dropTable "<%= d.tableName %>"
+  <% } %>

package/lib/migrations/migrate/stub/eg.stub

@@ -1,14 +1,14 @@
-provide: up, down
-
-up = (knex) ->
-  <% if (d.tableName) { %>
-  knex.schema.createTable "<%= d.tableName %>": t ->
-    t.increments()
-    t.timestamp()
-  <% } %>
-
-
-down = (knex) ->
-  <% if (d.tableName) { %>
-  knex.schema.dropTable("<%= d.tableName %>")
-  <% } %>
+provide: up, down
+
+up = (knex) ->
+  <% if (d.tableName) { %>
+  knex.schema.createTable "<%= d.tableName %>": t ->
+    t.increments()
+    t.timestamp()
+  <% } %>
+
+
+down = (knex) ->
+  <% if (d.tableName) { %>
+  knex.schema.dropTable("<%= d.tableName %>")
+  <% } %>

package/lib/migrations/migrate/stub/js-schema.stub

@@ -1,22 +1,22 @@
-/**
- * @param { import("knex").Knex } knex
- * @returns { Promise<void> }
- */
-exports.up = function({schema}) {
-  <% if (d.tableName) { %>
-  return schema.createTable("<%= d.tableName %>", function(t) {
-    t.increments();
-    t.timestamp();
-  });
-  <% } %>
-};
-
-/**
- * @param { import("knex").Knex } knex
- * @returns { Promise<void> }
- */
-exports.down = function({schema}) {
-  <% if (d.tableName) { %>
-  return schema.dropTable("<%= d.tableName %>");
-  <% } %>
-};
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.up = function({schema}) {
+  <% if (d.tableName) { %>
+  return schema.createTable("<%= d.tableName %>", function(t) {
+    t.increments();
+    t.timestamp();
+  });
+  <% } %>
+};
+
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.down = function({schema}) {
+  <% if (d.tableName) { %>
+  return schema.dropTable("<%= d.tableName %>");
+  <% } %>
+};

package/lib/migrations/migrate/stub/js.stub

@@ -1,22 +1,22 @@
-/**
- * @param { import("knex").Knex } knex
- * @returns { Promise<void> }
- */
-exports.up = function(knex) {
-  <% if (d.tableName) { %>
-  return knex.schema.createTable("<%= d.tableName %>", function(t) {
-    t.increments();
-    t.timestamp();
-  });
-  <% } %>
-};
-
-/**
- * @param { import("knex").Knex } knex
- * @returns { Promise<void> }
- */
-exports.down = function(knex) {
-  <% if (d.tableName) { %>
-  return knex.schema.dropTable("<%= d.tableName %>");
-  <% } %>
-};
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.up = function(knex) {
+  <% if (d.tableName) { %>
+  return knex.schema.createTable("<%= d.tableName %>", function(t) {
+    t.increments();
+    t.timestamp();
+  });
+  <% } %>
+};
+
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.down = function(knex) {
+  <% if (d.tableName) { %>
+  return knex.schema.dropTable("<%= d.tableName %>");
+  <% } %>
+};

package/lib/migrations/migrate/stub/knexfile-coffee.stub

@@ -1,34 +1,34 @@
-# Update with your config settings.
-
-module.exports =
-
-  development:
-    client: 'sqlite3'
-    connection:
-      filename: './dev.sqlite3'
-    migrations:
-      tableName: 'knex_migrations'
-
-  staging:
-    client: 'postgresql'
-    connection:
-      database: 'my_db'
-      user:     'username'
-      password: 'password'
-    pool:
-      min: 2
-      max: 10
-    migrations:
-      tableName: 'knex_migrations'
-
-  production:
-    client: 'postgresql'
-    connection:
-      database: 'my_db'
-      user:     'username'
-      password: 'password'
-    pool:
-      min: 2
-      max: 10
-    migrations:
-      tableName: 'knex_migrations'
+# Update with your config settings.
+
+module.exports =
+
+  development:
+    client: 'sqlite3'
+    connection:
+      filename: './dev.sqlite3'
+    migrations:
+      tableName: 'knex_migrations'
+
+  staging:
+    client: 'postgresql'
+    connection:
+      database: 'my_db'
+      user:     'username'
+      password: 'password'
+    pool:
+      min: 2
+      max: 10
+    migrations:
+      tableName: 'knex_migrations'
+
+  production:
+    client: 'postgresql'
+    connection:
+      database: 'my_db'
+      user:     'username'
+      password: 'password'
+    pool:
+      min: 2
+      max: 10
+    migrations:
+      tableName: 'knex_migrations'

package/lib/migrations/migrate/stub/knexfile-eg.stub

@@ -1,43 +1,43 @@
-;; Update with your config settings.
-
-module.exports = {
-   development = {
-      client = 'sqlite3'
-      connection = {
-         filename = './dev.sqlite3'
-      }
-      migrations = {
-         tableName = 'knex_migrations'
-      }
-   }
-   staging = {
-      client = 'postgresql'
-      connection = {
-         database = 'my_db'
-         user     = 'username'
-         password = 'password'
-      }
-      pool = {
-         min = 2
-         max = 10
-      }
-      migrations = {
-         tableName = 'knex_migrations'
-      }
-   }
-   production = {
-      client = 'postgresql'
-      connection = {
-         database = 'my_db'
-         user     = 'username'
-         password = 'password'
-      }
-      pool = {
-         min = 2
-         max = 10
-      }
-      migrations = {
-         tableName = 'knex_migrations'
-      }
-   }
-}
+;; Update with your config settings.
+
+module.exports = {
+   development = {
+      client = 'sqlite3'
+      connection = {
+         filename = './dev.sqlite3'
+      }
+      migrations = {
+         tableName = 'knex_migrations'
+      }
+   }
+   staging = {
+      client = 'postgresql'
+      connection = {
+         database = 'my_db'
+         user     = 'username'
+         password = 'password'
+      }
+      pool = {
+         min = 2
+         max = 10
+      }
+      migrations = {
+         tableName = 'knex_migrations'
+      }
+   }
+   production = {
+      client = 'postgresql'
+      connection = {
+         database = 'my_db'
+         user     = 'username'
+         password = 'password'
+      }
+      pool = {
+         min = 2
+         max = 10
+      }
+      migrations = {
+         tableName = 'knex_migrations'
+      }
+   }
+}

package/lib/migrations/migrate/stub/knexfile-js.stub

@@ -1,47 +1,47 @@
-// Update with your config settings.
-
-/**
- * @type { Object.<string, import("knex").Knex.Config> }
- */
-module.exports = {
-
-  development: {
-    client: 'sqlite3',
-    connection: {
-      filename: './dev.sqlite3'
-    }
-  },
-
-  staging: {
-    client: 'postgresql',
-    connection: {
-      database: 'my_db',
-      user:     'username',
-      password: 'password'
-    },
-    pool: {
-      min: 2,
-      max: 10
-    },
-    migrations: {
-      tableName: 'knex_migrations'
-    }
-  },
-
-  production: {
-    client: 'postgresql',
-    connection: {
-      database: 'my_db',
-      user:     'username',
-      password: 'password'
-    },
-    pool: {
-      min: 2,
-      max: 10
-    },
-    migrations: {
-      tableName: 'knex_migrations'
-    }
-  }
-
-};
+// Update with your config settings.
+
+/**
+ * @type { Object.<string, import("knex").Knex.Config> }
+ */
+module.exports = {
+
+  development: {
+    client: 'sqlite3',
+    connection: {
+      filename: './dev.sqlite3'
+    }
+  },
+
+  staging: {
+    client: 'postgresql',
+    connection: {
+      database: 'my_db',
+      user:     'username',
+      password: 'password'
+    },
+    pool: {
+      min: 2,
+      max: 10
+    },
+    migrations: {
+      tableName: 'knex_migrations'
+    }
+  },
+
+  production: {
+    client: 'postgresql',
+    connection: {
+      database: 'my_db',
+      user:     'username',
+      password: 'password'
+    },
+    pool: {
+      min: 2,
+      max: 10
+    },
+    migrations: {
+      tableName: 'knex_migrations'
+    }
+  }
+
+};

package/lib/migrations/migrate/stub/knexfile-ls.stub

@@ -1,35 +1,35 @@
-# Update with your config settings.
-
-module.exports =
-
-  development:
-    client: 'sqlite3'
-    connection:
-      filename: './dev.sqlite3'
-    migrations:
-      tableName: 'knex_migrations'
-
-  staging:
-    client: 'postgresql'
-    connection:
-      database: 'my_db'
-      user:     'username'
-      password: 'password'
-    pool:
-      min: 2
-      max: 10
-    migrations:
-      tableName: 'knex_migrations'
-
-  production:
-    client: 'postgresql'
-    connection:
-      database: 'my_db'
-      user:     'username'
-      password: 'password'
-    pool:
-      min: 2
-      max: 10
-    migrations:
-      tableName: 'knex_migrations'
-
+# Update with your config settings.
+
+module.exports =
+
+  development:
+    client: 'sqlite3'
+    connection:
+      filename: './dev.sqlite3'
+    migrations:
+      tableName: 'knex_migrations'
+
+  staging:
+    client: 'postgresql'
+    connection:
+      database: 'my_db'
+      user:     'username'
+      password: 'password'
+    pool:
+      min: 2
+      max: 10
+    migrations:
+      tableName: 'knex_migrations'
+
+  production:
+    client: 'postgresql'
+    connection:
+      database: 'my_db'
+      user:     'username'
+      password: 'password'
+    pool:
+      min: 2
+      max: 10
+    migrations:
+      tableName: 'knex_migrations'
+