dbgate-api 5.5.7-alpha.29 → 5.5.7-alpha.33

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dbgate-api",
   "main": "src/index.js",
-  "version": "5.5.7-alpha.29",
+  "version": "5.5.7-alpha.33",
   "homepage": "https://dbgate.org/",
   "repository": {
     "type": "git",
@@ -19,7 +19,7 @@
   "dependencies": {
     "@aws-sdk/rds-signer": "^3.665.0",
     "activedirectory2": "^2.1.0",
-    "async-lock": "^1.2.4",
+    "async-lock": "^1.2.6",
     "axios": "^0.21.1",
     "body-parser": "^1.19.0",
     "bufferutil": "^4.0.1",
@@ -27,10 +27,10 @@
     "compare-versions": "^3.6.0",
     "cors": "^2.8.5",
     "cross-env": "^6.0.3",
-    "dbgate-datalib": "^5.5.7-alpha.29",
+    "dbgate-datalib": "^5.5.7-alpha.33",
     "dbgate-query-splitter": "^4.11.2",
-    "dbgate-sqltree": "^5.5.7-alpha.29",
-    "dbgate-tools": "^5.5.7-alpha.29",
+    "dbgate-sqltree": "^5.5.7-alpha.33",
+    "dbgate-tools": "^5.5.7-alpha.33",
     "debug": "^4.3.4",
     "diff": "^5.0.0",
     "diff2html": "^3.4.13",
@@ -78,17 +78,12 @@
   "devDependencies": {
     "@types/fs-extra": "^9.0.11",
     "@types/lodash": "^4.14.149",
-    "dbgate-types": "^5.5.7-alpha.29",
+    "dbgate-types": "^5.5.7-alpha.33",
     "env-cmd": "^10.1.0",
     "node-loader": "^1.0.2",
     "nodemon": "^2.0.2",
     "typescript": "^4.4.3",
     "webpack": "^5.91.0",
     "webpack-cli": "^5.1.4"
-  },
-  "optionalDependencies": {
-    "better-sqlite3": "9.6.0",
-    "msnodesqlv8": "^4.2.1",
-    "oracledb": "^6.6.0"
   }
 }

package/src/currentVersion.js

@@ -1,5 +1,5 @@
 
 module.exports = { 
-  version: '5.5.7-alpha.29',
-  buildTime: '2024-11-12T08:27:02.193Z'
+  version: '5.5.7-alpha.33',
+  buildTime: '2024-11-13T11:33:35.991Z'
 };

package/src/shell/deployDb.js

@@ -4,6 +4,7 @@ const { ScriptDrivedDeployer } = require('dbgate-datalib');
 const connectUtility = require('../utility/connectUtility');
 const requireEngineDriver = require('../utility/requireEngineDriver');
 const loadModelFolder = require('../utility/loadModelFolder');
+const crypto = require('crypto');
 
 async function deployDb({
   connection,
@@ -24,7 +25,8 @@ async function deployDb({
     const scriptDeployer = new ScriptDrivedDeployer(
       dbhan,
       driver,
-      loadedDbModel ?? (await loadModelFolder(modelFolder))
+      Array.isArray(loadedDbModel) ? loadedDbModel : modelFolder ? await loadModelFolder(modelFolder) : [],
+      crypto
     );
     await scriptDeployer.runPre();
 

package/src/shell/requirePlugin.js

@@ -1,7 +1,6 @@
 const path = require('path');
 const fs = require('fs');
 const { pluginsdir, packagedPluginsDir, getPluginBackendPath } = require('../utility/directories');
-const nativeModules = require('../nativeModules');
 const platformInfo = require('../utility/platformInfo');
 const authProxy = require('../utility/authProxy');
 const { getLogger } = require('dbgate-tools');
@@ -11,7 +10,6 @@ const loadedPlugins = {};
 
 const dbgateEnv = {
   dbgateApi: null,
-  nativeModules,
   platformInfo,
   authProxy,
 };

package/src/utility/processArgs.js

@@ -17,9 +17,6 @@ const listenApiChild = process.argv.includes('--listen-api-child') || listenApi;
 
 function getPassArgs() {
   const res = [];
-  if (global['NATIVE_MODULES']) {
-    res.push('--native-modules', global['NATIVE_MODULES']);
-  }
   if (global['PLUGINS_DIR']) {
     res.push('--plugins-dir', global['PLUGINS_DIR']);
   }

package/src/nativeModules.js

@@ -1,13 +0,0 @@
-const argIndex = process.argv.indexOf('--native-modules');
-const redirectFile = global['NATIVE_MODULES'] || (argIndex > 0 ? process.argv[argIndex + 1] : null);
-
-function requireDynamic(file) {
-  try {
-    // @ts-ignore
-    return __non_webpack_require__(redirectFile);
-  } catch (err) {
-    return require(redirectFile);
-  }
-}
-
-module.exports = redirectFile ? requireDynamic(redirectFile) : require('./nativeModulesContent');

package/src/nativeModulesContent.js

@@ -1,9 +0,0 @@
-
-// this file is generated automatically by script fillNativeModules.js, do not edit it manually
-const content = {};
-
-content['better-sqlite3'] = () => require('better-sqlite3');
-content['oracledb'] = () => require('oracledb');
-
-
-module.exports = content;