Support @vscode/sqlite3 (#4866)

knex · Dec 5, 2021 · 7abb365 · 7abb365
1 parent 540ab8c
commit 7abb365
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 17 deletions.
diff --git a/lib/dialects/sqlite3/index.js b/lib/dialects/sqlite3/index.js
@@ -29,7 +29,7 @@ class Client_SQLite3 extends Client {
   }
 
   _driver() {
-    return require('sqlite3');
+    return require('@vscode/sqlite3');
   }
 
   schemaCompiler() {

diff --git a/package.json b/package.json
@@ -95,6 +95,7 @@
   },
   "devDependencies": {
     "@types/node": "^16.11.6",
+    "@vscode/sqlite3": "^5.0.7",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "chai-subset-in-order": "^3.1.0",
@@ -122,7 +123,6 @@
     "sinon": "^12.0.1",
     "sinon-chai": "^3.7.0",
     "source-map-support": "^0.5.20",
-    "sqlite3": "^5.0.2",
     "tap-spec": "^5.0.0",
     "tape": "^5.3.1",
     "tedious": "^12.2.0",

diff --git a/scripts/runkit-example.js b/scripts/runkit-example.js
@@ -1,4 +1,4 @@
-require('sqlite3');
+require('@vscode/sqlite3');
 const Knex = require('knex');
 
 const knexSqlite = Knex({

diff --git a/test/cli/esm-interop.spec.js b/test/cli/esm-interop.spec.js
@@ -3,7 +3,7 @@ const assert = require('assert');
 const path = require('path');
 const fs = require('fs');
 const { execCommand } = require('cli-testlab');
-const sqlite3 = require('sqlite3');
+const sqlite3 = require('@vscode/sqlite3');
 const semver = require('semver');
 const KNEX = path.normalize(__dirname + '/../../bin/cli.js');
 const NODE_VERSION = Number((/v(\d+)/i.exec(process.version) || [])[1]);

diff --git a/test/cli/migrate-unlock.spec.js b/test/cli/migrate-unlock.spec.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const path = require('path');
-const sqlite3 = require('sqlite3');
+const sqlite3 = require('@vscode/sqlite3');
 const { expect } = require('chai');
 const { execCommand } = require('cli-testlab');
 const { getRootDir } = require('./cli-test-utils');

diff --git a/test/cli/migrate.spec.js b/test/cli/migrate.spec.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const path = require('path');
-const sqlite3 = require('sqlite3');
+const sqlite3 = require('@vscode/sqlite3');
 const { expect } = require('chai');
 const { execCommand } = require('cli-testlab');
 const { getRootDir, setupFileHelper } = require('./cli-test-utils');

diff --git a/test/integration2/schema/alter.spec.js b/test/integration2/schema/alter.spec.js
@@ -125,7 +125,7 @@ describe('Schema', () => {
                 knex('alter_table').insert({ column_notNullable: 'text' })
               ).to.be.rejectedWith(
                 Error,
-                "insert into `alter_table` (`column_notNullable`) values ('text') - SQLITE_CONSTRAINT: NOT NULL constraint failed: alter_table.column_string"
+                "insert into `alter_table` (`column_notNullable`) values ('text') - SQLITE_CONSTRAINT_NOTNULL: NOT NULL constraint failed: alter_table.column_string"
               );
               expect(tableAfter).to.equal(
                 "CREATE TABLE \"alter_table\" (`column_integer` integer DEFAULT '0', `column_string` varchar(255) NOT NULL, `column_datetime` datetime NOT NULL DEFAULT '0', `column_defaultTo` integer DEFAULT '0', `column_notNullable` varchar(255) NOT NULL, `column_defaultToAndNotNullable` datetime NOT NULL DEFAULT '0', `column_nullable` boolean NULL)"
@@ -163,7 +163,7 @@ describe('Schema', () => {
                 knex('alter_table').insert({ column_notNullable: 'text' })
               ).to.be.rejectedWith(
                 Error,
-                "insert into `alter_table` (`column_notNullable`) values ('text') - SQLITE_CONSTRAINT: NOT NULL constraint failed: alter_table.column_nullable"
+                "insert into `alter_table` (`column_notNullable`) values ('text') - SQLITE_CONSTRAINT_NOTNULL: NOT NULL constraint failed: alter_table.column_nullable"
               );
               expect(tableAfter).to.equal(
                 "CREATE TABLE \"alter_table\" (`column_integer` integer, `column_string` varchar(255), `column_datetime` datetime, `column_defaultTo` integer DEFAULT '0', `column_notNullable` varchar(255) NOT NULL, `column_defaultToAndNotNullable` datetime NOT NULL DEFAULT '0', `column_nullable` boolean NOT NULL)"

diff --git a/test/integration2/schema/foreign-keys.spec.js b/test/integration2/schema/foreign-keys.spec.js
@@ -201,7 +201,7 @@ describe('Schema', () => {
             } catch (err) {
               if (isSQLite(knex)) {
                 expect(err.message).to.equal(
-                  `insert into \`foreign_keys_table_one\` (\`fkey_three\`, \`fkey_two\`) values (99, 9999) - SQLITE_CONSTRAINT: FOREIGN KEY constraint failed`
+                  `insert into \`foreign_keys_table_one\` (\`fkey_three\`, \`fkey_two\`) values (99, 9999) - SQLITE_CONSTRAINT_FOREIGNKEY: FOREIGN KEY constraint failed`
                 );
               }
               if (isPostgreSQL(knex)) {
@@ -332,7 +332,7 @@ describe('Schema', () => {
               } catch (err) {
                 if (isSQLite(knex)) {
                   expect(err.message).to.equal(
-                    `insert into \`foreign_keys_table_one\` (\`fkey_four_part1\`, \`fkey_four_part2\`, \`fkey_three\`, \`fkey_two\`) values ('a', 'b', 99, 9999) - SQLITE_CONSTRAINT: FOREIGN KEY constraint failed`
+                    `insert into \`foreign_keys_table_one\` (\`fkey_four_part1\`, \`fkey_four_part2\`, \`fkey_three\`, \`fkey_two\`) values ('a', 'b', 99, 9999) - SQLITE_CONSTRAINT_FOREIGNKEY: FOREIGN KEY constraint failed`
                   );
                 }
                 if (isPostgreSQL(knex)) {

diff --git a/test/integration2/schema/primary-keys.spec.js b/test/integration2/schema/primary-keys.spec.js
@@ -47,7 +47,7 @@ describe('Schema', () => {
             } catch (err) {
               if (isSQLite(knex)) {
                 expect(err.message).to.equal(
-                  'insert into `primary_table` (`id_four`) values (1) - SQLITE_CONSTRAINT: UNIQUE constraint failed: primary_table.id_four'
+                  'insert into `primary_table` (`id_four`) values (1) - SQLITE_CONSTRAINT_PRIMARYKEY: UNIQUE constraint failed: primary_table.id_four'
                 );
               }
               if (isPgBased(knex)) {
@@ -78,7 +78,7 @@ describe('Schema', () => {
             } catch (err) {
               if (isSQLite(knex)) {
                 expect(err.message).to.equal(
-                  'insert into `primary_table` (`id_four`) values (1) - SQLITE_CONSTRAINT: UNIQUE constraint failed: primary_table.id_four'
+                  'insert into `primary_table` (`id_four`) values (1) - SQLITE_CONSTRAINT_PRIMARYKEY: UNIQUE constraint failed: primary_table.id_four'
                 );
               }
               if (isPgBased(knex)) {
@@ -114,7 +114,7 @@ describe('Schema', () => {
             } catch (err) {
               if (isSQLite(knex)) {
                 expect(err.message).to.equal(
-                  'insert into `primary_table` (`id_three`, `id_two`) values (1, 1) - SQLITE_CONSTRAINT: UNIQUE constraint failed: primary_table.id_two, primary_table.id_three'
+                  'insert into `primary_table` (`id_three`, `id_two`) values (1, 1) - SQLITE_CONSTRAINT_PRIMARYKEY: UNIQUE constraint failed: primary_table.id_two, primary_table.id_three'
                 );
               }
               if (isPgBased(knex)) {
@@ -156,7 +156,7 @@ describe('Schema', () => {
               } catch (err) {
                 if (isSQLite(knex)) {
                   expect(err.message).to.equal(
-                    'insert into `primary_table` (`id_three`, `id_two`) values (1, 1) - SQLITE_CONSTRAINT: UNIQUE constraint failed: primary_table.id_two, primary_table.id_three'
+                    'insert into `primary_table` (`id_three`, `id_two`) values (1, 1) - SQLITE_CONSTRAINT_PRIMARYKEY: UNIQUE constraint failed: primary_table.id_two, primary_table.id_three'
                   );
                 }
                 if (isPgBased(knex)) {

diff --git a/test/integration2/schema/set-nullable.spec.js b/test/integration2/schema/set-nullable.spec.js
@@ -90,7 +90,7 @@ describe('Schema', () => {
               errorMessage = 'ORA-01400: cannot insert NULL into';
             } else if (isSQLite(knex)) {
               errorMessage =
-                'insert into `primary_table` (`id_not_nullable`, `id_nullable`) values (1, NULL) - SQLITE_CONSTRAINT: NOT NULL constraint failed: primary_table.id_nullable';
+                'insert into `primary_table` (`id_not_nullable`, `id_nullable`) values (1, NULL) - SQLITE_CONSTRAINT_NOTNULL: NOT NULL constraint failed: primary_table.id_nullable';
             }
 
             await expect(

diff --git a/test/jake/jakelib/migrate-test.js b/test/jake/jakelib/migrate-test.js
@@ -6,7 +6,7 @@ const os = require('os');
 const fs = require('fs');
 const rimrafSync = require('rimraf').sync;
 const path = require('path');
-const sqlite3 = require('sqlite3');
+const sqlite3 = require('@vscode/sqlite3');
 const { assert } = require('chai');
 const {
   assertExec,

diff --git a/test/unit/knex.js b/test/unit/knex.js
@@ -2,7 +2,7 @@ const Knex = require('../../lib/index');
 const QueryBuilder = require('../../lib/query/querybuilder');
 const { expect } = require('chai');
 const sqliteConfig = require('../knexfile').sqlite3;
-const sqlite3 = require('sqlite3');
+const sqlite3 = require('@vscode/sqlite3');
 const { noop } = require('lodash');
 const sinon = require('sinon');