v4.2.0-beta.4

upgrade better-sqlite
Revert "try to fix sqlite problem"
2021-05-13 09:34:30 +02:00 · 2021-05-13 09:34:07 +02:00 · 2021-05-13 09:32:17 +02:00
7 changed files with 14 additions and 26 deletions
--- a/app/package.json
+++ b/app/package.json
@@ -5,7 +5,7 @@
  "author": "Jan Prochazka <jenasoft.database@gmail.com>",
  "description": "Opensource database administration tool",
  "dependencies": {
-    "better-sqlite3-with-prebuilds": "^7.1.8",
+    "better-sqlite3": "^7.3.1",
    "electron-log": "^4.3.1",
    "electron-store": "^5.1.1",
    "electron-updater": "^4.3.5"
--- a/app/yarn.lock
+++ b/app/yarn.lock
@@ -60,11 +60,6 @@
  dependencies:
    "@types/node" "*"

-"@types/integer@latest":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@types/integer/-/integer-4.0.0.tgz#3b778715df72d2cf8ba73bad27bd9d830907f944"
-  integrity sha512-2U1i6bIRiqizl6O+ETkp2HhUZIxg7g+burUabh9tzGd0qcszfNaFRaY9bGNlQKgEU7DCsH5qMajRDW5QamWQbw==
-
 "@types/node@*":
  version "13.9.1"
  resolved "https://registry.yarnpkg.com/@types/node/-/node-13.9.1.tgz#96f606f8cd67fb018847d9b61e93997dabdefc72"
@@ -237,12 +232,11 @@ base64-js@^1.3.1:
  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==

-better-sqlite3-with-prebuilds@^7.1.8:
-  version "7.1.8"
-  resolved "https://registry.yarnpkg.com/better-sqlite3-with-prebuilds/-/better-sqlite3-with-prebuilds-7.1.8.tgz#3090c478fe9b60e74ce053a76807b189784f62d7"
-  integrity sha512-trwg1qhN91cPYEB8D2K0KVHIsMsiAnxKx6/syfQ7rLrtD+zOS3fqJq4VGszMF+OuYAZJNAR4oLsikys3YW/6aA==
+better-sqlite3@^7.3.1:
+  version "7.3.1"
+  resolved "https://registry.yarnpkg.com/better-sqlite3/-/better-sqlite3-7.3.1.tgz#2dcccfa4c34c544073d12fbb172281a13925fbb8"
+  integrity sha512-Io0eWFWEtHsA7KS7Ehm45AGwi5SHeCD1hIHd+b1nj26Tf7rFTBqMltuVDimNMNMJ6f+Oy29RT7XWinv3yWKvIQ==
  dependencies:
-    "@types/integer" latest
    bindings "^1.5.0"
    prebuild-install "^6.0.1"
    tar "^6.1.0"
--- a/fillNativeModules.js
+++ b/fillNativeModules.js
@@ -5,7 +5,7 @@ let fillContent = '';
 if (process.platform == 'win32') {
  fillContent += `content.msnodesqlv8 = () => require('msnodesqlv8');`;
 }
-fillContent += `content['better-sqlite3-with-prebuilds'] = () => require('better-sqlite3-with-prebuilds');`;
+fillContent += `content['better-sqlite3'] = () => require('better-sqlite3');`;

 const getContent = (empty) => `
 // this file is generated automatically by script fillNativeModules.js, do not edit it manually
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "private": true,
-  "version": "4.2.0-beta.3",
+  "version": "4.2.0-beta.4",
  "name": "dbgate-all",
  "workspaces": [
    "packages/*",
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -19,7 +19,7 @@
  "dependencies": {
    "async-lock": "^1.2.4",
    "axios": "^0.19.0",
-    "better-sqlite3-with-prebuilds": "^7.1.8",
+    "better-sqlite3": "^7.3.1",
    "body-parser": "^1.19.0",
    "bufferutil": "^4.0.1",
    "byline": "^5.0.0",
--- a/plugins/dbgate-plugin-sqlite/src/backend/driver.js
+++ b/plugins/dbgate-plugin-sqlite/src/backend/driver.js
@@ -162,8 +162,8 @@ const driver = {
 };

 driver.initialize = (dbgateEnv) => {
-  if (dbgateEnv.nativeModules && dbgateEnv.nativeModules['better-sqlite3-with-prebuilds']) {
-    Database = dbgateEnv.nativeModules['better-sqlite3-with-prebuilds']();
+  if (dbgateEnv.nativeModules && dbgateEnv.nativeModules['better-sqlite3']) {
+    Database = dbgateEnv.nativeModules['better-sqlite3']();
  }
 };

--- a/yarn.lock
+++ b/yarn.lock
@@ -631,11 +631,6 @@
    "@types/minimatch" "*"
    "@types/node" "*"

-"@types/integer@latest":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@types/integer/-/integer-4.0.0.tgz#3b778715df72d2cf8ba73bad27bd9d830907f944"
-  integrity sha512-2U1i6bIRiqizl6O+ETkp2HhUZIxg7g+burUabh9tzGd0qcszfNaFRaY9bGNlQKgEU7DCsH5qMajRDW5QamWQbw==
-
 "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0":
  version "2.0.1"
  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff"
@@ -1436,12 +1431,11 @@ better-assert@~1.0.0:
  dependencies:
    callsite "1.0.0"

-better-sqlite3-with-prebuilds@^7.1.8:
-  version "7.1.8"
-  resolved "https://registry.yarnpkg.com/better-sqlite3-with-prebuilds/-/better-sqlite3-with-prebuilds-7.1.8.tgz#3090c478fe9b60e74ce053a76807b189784f62d7"
-  integrity sha512-trwg1qhN91cPYEB8D2K0KVHIsMsiAnxKx6/syfQ7rLrtD+zOS3fqJq4VGszMF+OuYAZJNAR4oLsikys3YW/6aA==
+better-sqlite3@^7.3.1:
+  version "7.3.1"
+  resolved "https://registry.yarnpkg.com/better-sqlite3/-/better-sqlite3-7.3.1.tgz#2dcccfa4c34c544073d12fbb172281a13925fbb8"
+  integrity sha512-Io0eWFWEtHsA7KS7Ehm45AGwi5SHeCD1hIHd+b1nj26Tf7rFTBqMltuVDimNMNMJ6f+Oy29RT7XWinv3yWKvIQ==
  dependencies:
-    "@types/integer" latest
    bindings "^1.5.0"
    prebuild-install "^6.0.1"
    tar "^6.1.0"
Author	SHA1	Message	Date
Jan Prochazka	354b5c2fa3	v4.2.0-beta.4	2021-05-13 09:34:30 +02:00
Jan Prochazka	f28e0374f8	upgrade better-sqlite	2021-05-13 09:34:07 +02:00
Jan Prochazka	99d97e5dda	Revert "try to fix sqlite problem" This reverts commit `23225cf86b`.	2021-05-13 09:32:17 +02:00