knex 1.0.7 → 2.0.0

package/CHANGELOG.md

@@ -1,19 +1,30 @@
 # Master (Unreleased)
 
-# 1.0.7 - 13 March, 2022
+# 2.0.0 - 21 April, 2022
+
+### Breaking changes
+
+- Restore sqlite3 package #5136
+
+### Test / internal changes:
+
+- Migrate Husky from 4 to 7 #5137
+- Migrate Jake to 10.8.5 #5138
+
+# 1.0.7 - 13 April, 2022
 
 ### Bug fixes:
 
 - CLI: Fix cli migrate:make SQLite dependency #5106
 
-# 1.0.6 - 12 March, 2022
+# 1.0.6 - 12 April, 2022
 
 ### Bug fixes:
 
 - PostgreSQL: Wait for search path to be set before returning connection #5107
 - CLI: No client override during migrate:make #5109
 
-# 1.0.5 - 05 March, 2022
+# 1.0.5 - 05 April, 2022
 
 ### New features:
 

package/UPGRADING.md

@@ -1,5 +1,9 @@
 ## Upgrading to new knex.js versions
 
+### Upgrading to version 2.0.0+
+
+* Since `sqlite3` is maintained again, we switched back to it. If you are using `@vscode/sqlite3` driver dependency, please replace it with `sqlite3` in your `package.json`;
+
 ### Upgrading to version 1.0.0+
 
 * Node.js older than 12 is no longer supported, make sure to update your environment;

package/lib/client.js

@@ -189,10 +189,7 @@ class Client extends EventEmitter {
     try {
       this.driver = this._driver();
     } catch (e) {
-      const driverName = this.aliasDriverName
-        ? this.aliasDriverName
-        : this.driverName;
-      const message = `Knex: run\n$ npm install ${driverName} --save`;
+      const message = `Knex: run\n$ npm install ${this.driverName} --save`;
       this.logger.error(`${message}\n${e.message}\n${e.stack}`);
       throw new Error(`${message}\n${e.message}`);
     }

package/lib/dialects/sqlite3/index.js

@@ -30,7 +30,7 @@ class Client_SQLite3 extends Client {
   }
 
   _driver() {
-    return require('@vscode/sqlite3');
+    return require('sqlite3');
   }
 
   schemaCompiler() {
@@ -232,8 +232,6 @@ Object.assign(Client_SQLite3.prototype, {
   dialect: 'sqlite3',
 
   driverName: 'sqlite3',
-  // SqlLite3 driver package name is different from driver name.
-  aliasDriverName: '@vscode/sqlite3',
 });
 
 module.exports = Client_SQLite3;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "knex",
-  "version": "1.0.7",
+  "version": "2.0.0",
   "description": "A batteries-included SQL query & schema builder for PostgresSQL, MySQL, CockroachDB, MSSQL and SQLite3",
   "main": "knex",
   "types": "types/index.d.ts",
@@ -51,7 +51,8 @@
     "db:stop:oracle": "docker-compose -f scripts/docker-compose.yml down",
     "stress:init": "docker-compose -f scripts/stress-test/docker-compose.yml up --no-start && docker-compose -f scripts/stress-test/docker-compose.yml start",
     "stress:test": "node scripts/stress-test/knex-stress-test.js | grep -A 5 -B 60 -- '- STATS '",
-    "stress:destroy": "docker-compose -f scripts/stress-test/docker-compose.yml stop"
+    "stress:destroy": "docker-compose -f scripts/stress-test/docker-compose.yml stop",
+    "prepare": "husky install"
   },
   "dependencies": {
     "colorette": "2.0.16",
@@ -85,7 +86,7 @@
     "pg-native": {
       "optional": true
     },
-    "@vscode/sqlite3": {
+    "sqlite3": {
       "optional": true
     },
     "better-sqlite3": {
@@ -99,8 +100,7 @@
     ]
   },
   "devDependencies": {
-    "@types/node": "^16.11.22",
-    "@vscode/sqlite3": "^5.0.7",
+    "@types/node": "^17.0.25",
     "better-sqlite3": "^7.5.1",
     "chai": "^4.3.6",
     "chai-as-promised": "^7.1.1",
@@ -113,8 +113,8 @@
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-mocha-no-only": "^1.1.1",
-    "husky": "^4.3.8",
-    "jake": "^8.1.1",
+    "husky": "^7.0.4",
+    "jake": "^10.8.5",
     "JSONStream": "^1.3.5",
     "lint-staged": "^12.3.7",
     "mocha": "^9.2.2",
@@ -130,6 +130,7 @@
     "sinon": "^13.0.1",
     "sinon-chai": "^3.7.0",
     "source-map-support": "^0.5.21",
+    "sqlite3": "^5.0.4",
     "tap-spec": "^5.0.0",
     "tape": "^5.5.3",
     "tedious": "^14.4.0",
@@ -204,7 +205,6 @@
     "pg-query-stream": false,
     "oracle": false,
     "sqlite3": false,
-    "@vscode/sqlite3": false,
     "better-sqlite3": false,
     "oracledb": false
   },
@@ -242,11 +242,6 @@
       "lib/dialects/oracledb"
     ]
   },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
-  },
   "tsd": {
     "directory": "test-tsd",
     "compilerOptions": {

package/scripts/runkit-example.js

@@ -1,4 +1,4 @@
-require('@vscode/sqlite3');
+require('sqlite3');
 const Knex = require('knex');
 
 const knexSqlite = Knex({

package/types/index.d.ts

@@ -2097,12 +2097,12 @@ export declare namespace Knex {
     binary(columnName: string, length?: number): ColumnBuilder;
     enum(
       columnName: string,
-      values: readonly Value[],
+      values: (readonly Value[]) | null,
       options?: EnumOptions
     ): ColumnBuilder;
     enu(
       columnName: string,
-      values: readonly Value[],
+      values: (readonly Value[]) | null,
       options?: EnumOptions
     ): ColumnBuilder;
     json(columnName: string): ColumnBuilder;