dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-18 12:35:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

postpone creation of native modules #561

Browse Source
This commit is contained in:
Jan Prochazka
2023-05-26 17:48:22 +02:00
parent 171f97ee0c
commit b65d211def
4 changed files with 39 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/dbgate-plugin-mssql/src/backend/driver.js
View File

@@ -9,7 +9,7 @@ const nativeDriver = require('./nativeDriver');
const lock = new AsyncLock();
const { tediousConnect, tediousQueryCore, tediousReadQuery, tediousStream } = require('./tediousDriver');
const { nativeConnect, nativeQueryCore, nativeReadQuery, nativeStream } = nativeDriver;
let msnodesqlv8;
let requireMsnodesqlv8;
const versionQuery = `
SELECT
@@ -52,12 +52,12 @@ const driver = {
analyserClass: MsSqlAnalyser,
getAuthTypes() {
return msnodesqlv8 ? windowsAuthTypes : null;
return requireMsnodesqlv8 ? windowsAuthTypes : null;
},
async connect(conn) {
const { authType } = conn;
if (msnodesqlv8 && (authType == 'sspi' || authType == 'sql')) {
if (requireMsnodesqlv8 && (authType == 'sspi' || authType == 'sql')) {
return nativeConnect(conn);
}
@@ -119,7 +119,7 @@ const driver = {
driver.initialize = dbgateEnv => {
if (dbgateEnv.nativeModules && dbgateEnv.nativeModules.msnodesqlv8) {
msnodesqlv8 = dbgateEnv.nativeModules.msnodesqlv8();
requireMsnodesqlv8 = dbgateEnv.nativeModules.msnodesqlv8;
}
nativeDriver.initialize(dbgateEnv);
};

14
plugins/dbgate-plugin-mssql/src/backend/nativeDriver.js
View File

@@ -1,7 +1,7 @@
const _ = require('lodash');
const stream = require('stream');
const makeUniqueColumnNames = require('./makeUniqueColumnNames');
let msnodesqlv8;
let requireMsnodesqlv8;
// async function nativeQueryCore(pool, sql, options) {
// if (sql == null) {
@@ -20,6 +20,14 @@ let msnodesqlv8;
// });
// }
let msnodesqlv8Value;
function getMsnodesqlv8() {
if (!msnodesqlv8Value) {
msnodesqlv8Value = requireMsnodesqlv8();
}
return msnodesqlv8Value;
}
function extractNativeColumns(meta) {
const res = meta.map(col => {
const resCol = {
@@ -51,7 +59,7 @@ async function connectWithDriver({ server, port, user, password, database, authT
else connectionString += `;UID=${user};PWD=${password}`;
if (database) connectionString += `;Database=${database}`;
return new Promise((resolve, reject) => {
msnodesqlv8.open(connectionString, (err, conn) => {
getMsnodesqlv8().open(connectionString, (err, conn) => {
if (err) {
reject(err);
} else {
@@ -219,7 +227,7 @@ async function nativeStream(pool, sql, options) {
const initialize = dbgateEnv => {
if (dbgateEnv.nativeModules && dbgateEnv.nativeModules.msnodesqlv8) {
msnodesqlv8 = dbgateEnv.nativeModules.msnodesqlv8();
requireMsnodesqlv8 = dbgateEnv.nativeModules.msnodesqlv8;
}
};