@l-v-yonsama/multi-platform-database-drivers 0.1.24 → 0.1.28

package/built/src/db/drivers/BaseDriver.d.ts

@@ -35,5 +35,4 @@ export interface RequestSqlOptions {
     needs_column_resolve?: boolean;
     progress_callback?: Function;
     max_rows?: number;
-    auto_connection?: boolean;
 }

package/built/src/service/DBAccessService.d.ts

@@ -6,6 +6,7 @@ export declare class DBAccessService {
     static removeConnectionSetting(req: RemoveConnectionSettingRequest): Promise<GeneralDBResponse>;
     static testConnectionSetting(req: TestConnectionSettingRequest): Promise<GeneralDBResponse>;
     static connect(req: ConnectRequest): Promise<GeneralDBResponse<ConnectionResult>>;
+    private static createNewDriver;
     static disconnect(req: RequestInConnectedState): Promise<GeneralDBResponse>;
     static disconnectAll(): Promise<GeneralDBResponse>;
     static batchInsertFromArray(req: BatchInsertFromArrayRequest): Promise<GeneralDBResponse>;

package/built/src/service/DBAccessService.js

@@ -52,13 +52,7 @@ class DBAccessService {
             const command = request_1.GeneralDBCommandType.Connect;
             const st_tm = new Date().getTime();
             try {
-                const resolver = DBDriverResolver_1.DBDriverResolver.getInstance();
-                const setting = resolver.getSettingByName(req.connectionName);
-                if (!setting) {
-                    throw new Error('Missing connection setting.');
-                }
-                const def = resolver.createDriver(setting);
-                const driver = resolver.getDriverById(def.getConnectionRes().id);
+                const driver = this.createNewDriver(req.connectionName);
                 let errorMessage = '';
                 errorMessage = yield driver.connect();
                 const ok = errorMessage.length === 0;
@@ -72,6 +66,15 @@ class DBAccessService {
             }
         });
     }
+    static createNewDriver(connectionName) {
+        const resolver = DBDriverResolver_1.DBDriverResolver.getInstance();
+        const setting = resolver.getSettingByName(connectionName);
+        if (!setting) {
+            throw new Error('Missing connection setting.');
+        }
+        const def = resolver.createDriver(setting);
+        return resolver.getDriverById(def.getConnectionRes().id);
+    }
     static disconnect(req) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const st_tm = new Date().getTime();
@@ -123,7 +126,6 @@ class DBAccessService {
                     const sql = `INSERT INTO ${schemaPrefix}${req.options.tableName} (${req.options.columns.join(',')}) VALUES(${values.join(',')})`;
                     rs = yield driver.requestSql(sql, {
                         needs_column_resolve: false,
-                        auto_connection: req.options.autoConnection,
                     });
                     if (rs.errorMessage) {
                         error_message = rs.errorMessage;
@@ -147,17 +149,22 @@ class DBAccessService {
         });
     }
     static viewData(req) {
+        var _a, _b;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const command = request_1.GeneralDBCommandType.ViewData;
             const st_tm = new Date().getTime();
             let error_message = '';
             let rs;
             try {
-                const driver = this.getDriver(req);
                 let requiredConnect = false;
-                if (!driver.isConnected && req.options && req.options.autoConnection) {
-                    requiredConnect = true;
+                let driver = null;
+                if (((_a = req.options) === null || _a === void 0 ? void 0 : _a.autoConnection) === true && ((_b = req.options) === null || _b === void 0 ? void 0 : _b.connectionName)) {
+                    driver = this.createNewDriver(req.options.connectionName);
                     error_message = yield driver.connect();
+                    requiredConnect = true;
+                }
+                else {
+                    driver = this.getDriver(req);
                 }
                 rs = db_1.ResultSetDataHolder.createEmpty();
                 if (!error_message) {
@@ -182,7 +189,6 @@ class DBAccessService {
                                 }
                                 rs = yield driver.requestSql(`SELECT ${cols} FROM ${sp}${req.options.tableName} `, {
                                     needs_column_resolve: false,
-                                    auto_connection: req.options.autoConnection,
                                     progress_callback: (message, progress) => {
                                         this.sendProgress('database.general.request', message, progress, {
                                             name: driver.getName(),
@@ -197,6 +203,8 @@ class DBAccessService {
                     }
                     if (requiredConnect) {
                         yield driver.disconnect();
+                        const resolver = DBDriverResolver_1.DBDriverResolver.getInstance();
+                        resolver.removeDriver(driver);
                     }
                 }
                 if (error_message) {
@@ -210,48 +218,41 @@ class DBAccessService {
         });
     }
     static executeSql(req) {
+        var _a, _b;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const command = request_1.GeneralDBCommandType.ExecuteSql;
             const st_tm = new Date().getTime();
+            let error_message = '';
             try {
-                const driver = this.getDriver(req);
+                let requiredConnect = false;
+                let driver = null;
+                if (((_a = req.options) === null || _a === void 0 ? void 0 : _a.autoConnection) === true && ((_b = req.options) === null || _b === void 0 ? void 0 : _b.connectionName)) {
+                    driver = this.createNewDriver(req.options.connectionName);
+                    error_message = yield driver.connect();
+                    requiredConnect = true;
+                }
+                else {
+                    driver = this.getDriver(req);
+                }
                 const execOptions = {
                     needs_column_resolve: req.options.needsColumnResolve,
-                    auto_connection: req.options.autoConnection,
-                    progress_callback: (message, progress) => {
-                        this.sendProgress('database.general.request', message, progress, {
-                            name: driver.getName(),
-                        });
-                    },
                 };
                 if (req.options) {
                     execOptions.max_rows = req.options.maxRows;
                 }
-                let connectionIsNotReady = false;
-                let requiredConnect = false;
-                if (!driver.isConnected) {
-                    if (execOptions.auto_connection) {
-                        requiredConnect = true;
-                        yield driver.connect();
-                    }
-                    else {
-                        connectionIsNotReady = true;
-                    }
-                }
-                if (connectionIsNotReady) {
-                    throw new Error(`Connection DB first.`);
+                const rs = yield driver.requestSql(req.options.sql, execOptions);
+                this.sendProgress('database.general.request', 'Server process end.', 75, {
+                    name: driver.getName(),
+                });
+                if (requiredConnect) {
+                    yield driver.disconnect();
+                    const resolver = DBDriverResolver_1.DBDriverResolver.getInstance();
+                    resolver.removeDriver(driver);
                 }
-                else {
-                    const rs = yield driver.requestSql(req.options.sql, execOptions);
-                    this.sendProgress('database.general.request', 'Server process end.', 75, { name: driver.getName() });
-                    if (requiredConnect) {
-                        yield driver.disconnect();
-                    }
-                    if (rs.errorMessage) {
-                        return this.createResponse(command, false, rs.errorMessage, st_tm, rs);
-                    }
-                    return this.createResponse(command, true, '', st_tm, rs);
+                if (rs.errorMessage) {
+                    return this.createResponse(command, false, rs.errorMessage, st_tm, rs);
                 }
+                return this.createResponse(command, true, '', st_tm, rs);
             }
             catch (e) {
                 return this.createResponse(command, false, e.message, st_tm);

package/built/src/service/DBAccessService.js.map

@@ -1 +1 @@
-{"version":3,"file":"DBAccessService.js","sourceRoot":"","sources":["../../../src/service/DBAccessService.ts"],"names":[],"mappings":";;;;AAAA,8BAQe;AACf,yDAAsD;AACtD,uCAWmB;AAGnB,MAAa,eAAe;IACnB,MAAM,CAAO,oBAAoB,CACtC,GAAgC;;YAEhC,MAAM,OAAO,GAAG,8BAAoB,CAAC,oBAAoB,CAAC;YAC1D,MAAM,KAAK,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;YACnC,MAAM,QAAQ,GAAG,mCAAgB,CAAC,WAAW,EAAE,CAAC;YAChD,QAAQ,CAAC,oBAAoB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC3C,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;QACvD,CAAC;KAAA;IAEM,MAAM,CAAO,uBAAuB,CACzC,GAAmC;;YAEnC,MAAM,OAAO,GAAG,8BAAoB,CAAC,uBAAuB,CAAC;YAC7D,MAAM,KAAK,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;YACnC,MAAM,QAAQ,GAAG,mCAAgB,CAAC,WAAW,EAAE,CAAC;YAChD,QAAQ,CAAC,6BAA6B,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;YAC3D,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;QACvD,CAAC;KAAA;IAEM,MAAM,CAAO,qBAAqB,CACvC,GAAiC;;YAEjC,MAAM,OAAO,GAAG,8BAAoB,CAAC,qBAAqB,CAAC;YAC3D,MAAM,KAAK,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;YACnC,IAAI;gBACF,MAAM,QAAQ,GAAG,mCAAgB,CAAC,WAAW,EAAE,CAAC;gBAChD,MAAM,OAAO,GAAG,IAAI,iBAAY,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBAC9C,MAAM,MAAM,GAAG,QAAQ,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;gBAC9C,IAAI,MAAM,EAAE;oBACV,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBACvC,IAAI,MAAM,EAAE;wBACV,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;qBAC/D;oBACD,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;iBACtD;gBACD,OAAO,IAAI,CAAC,cAAc,CACxB,OAAO,EACP,KAAK,EACL,gBAAgB,EAChB,KAAK,EACL,EAAE,CACH,CAAC;aACH;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;gBAC9B,OAAO,IAAI,CAAC,cAAc,CACxB,OAAO,EACP,KAAK,EACL,gBAAgB,EAChB,KAAK,EACL,EAAE,CACH,CAAC;aACH;QACH,CAAC;KAAA;IAEM,MAAM,CAAO,OAAO,CACzB,GAAmB;;YAEnB,MAAM,OAAO,GAAG,8BAAoB,CAAC,OAAO,CAAC;YAC7C,MAAM,KAAK,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;YACnC,IAAI;gBACF,MAAM,QAAQ,GAAG,mCAAgB,CAAC,WAAW,EAAE,CAAC;gBAChD,MAAM,OAAO,GAAG,QAAQ,CAAC,gBAAgB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;gBAC9D,IAAI,CAAC,OAAO,EAAE;oBACZ,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;iBAChD;gBACD,MAAM,GAAG,GAAG,QAAQ,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;gBAC3C,MAAM,MAAM,GAAG,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC,EAAE,CAAC,CAAC;gBACjE,IAAI,YAAY,GAAG,EAAE,CAAC;gBACtB,YAAY,GAAG,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC;gBACtC,MAAM,EAAE,GAAG,YAAY,CAAC,MAAM,KAAK,CAAC,CAAC;gBACrC,MAAM,MAAM,GAAqB;oBAC/B,YAAY,EAAE,MAAM,CAAC,gBAAgB,EAAE,CAAC,EAAE;iBAC3C,CAAC;gBAEF,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;aACtE;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;aAC9D;QACH,CAAC;KAAA;IAEM,MAAM,CAAO,UAAU,CAC5B,GAA4B;;YAE5B,MAAM,KAAK,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;YACnC,IAAI,YAAY,GAAG,EAAE,CAAC;YACtB,IAAI,EAAE,GAAG,IAAI,CAAC;YACd,IAAI;gBACF,MAAM,MAAM,GAAG,mCAAgB,CAAC,WAAW,EAAE,CAAC,aAAa,CACzD,GAAG,CAAC,YAAY,CACjB,CAAC;gBAEF,YAAY,GAAG,MAAM,MAAM,CAAC,UAAU,EAAE,CAAC;gBACzC,EAAE,GAAG,YAAY,CAAC,MAAM,KAAK,CAAC,CAAC;aAChC;YAAC,OAAO,CAAC,EAAE;gBACV,EAAE,GAAG,KAAK,CAAC;gBACX,YAAY,GAAG,CAAC,CAAC,OAAO,CAAC;aAC1B;YACD,OAAO,IAAI,CAAC,cAAc,CACxB,8BAAoB,CAAC,UAAU,EAC/B,EAAE,EACF,YAAY,EACZ,KAAK,CACN,CAAC;QACJ,CAAC;KAAA;IAEM,MAAM,CAAO,aAAa;;YAC/B,MAAM,KAAK,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;YAEnC,MAAM,YAAY,GAAG,MAAM,mCAAgB,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE,CAAC;YACrE,MAAM,EAAE,GAAG,YAAY,CAAC,MAAM,KAAK,CAAC,CAAC;YACrC,OAAO,IAAI,CAAC,cAAc,CACxB,8BAAoB,CAAC,aAAa,EAClC,EAAE,EACF,YAAY,EACZ,KAAK,CACN,CAAC;QACJ,CAAC;KAAA;IAEM,MAAM,CAAO,oBAAoB,CACtC,GAAgC;;YAEhC,MAAM,OAAO,GAAG,8BAAoB,CAAC,oBAAoB,CAAC;YAE1D,MAAM,KAAK,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;YAEnC,IAAI,EAAuB,CAAC;YAC5B,IAAI;gBACF,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;gBACnC,IAAI,eAAe,GAAG,KAAK,CAAC;gBAC5B,IAAI,CAAC,MAAM,CAAC,WAAW,IAAI,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,cAAc,EAAE;oBACpE,eAAe,GAAG,IAAI,CAAC;oBACvB,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC;iBACxB;gBACD,IAAI,aAAa,GAAG,EAAE,CAAC;gBACvB,IAAI,YAAY,GAAG,EAAE,CAAC;gBACtB,IAAI,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE;oBAC1B,YAAY,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,UAAU,GAAG,CAAC;iBAC7C;gBACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;oBACpD,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;oBACvC,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CACzB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAC9C,CAAC;oBACF,IAAI,CAAC,YAAY,CAAC,+BAA+B,EAAE,QAAQ,EAAE,QAAQ,EAAE;wBACrE,IAAI,EAAE,MAAM,CAAC,OAAO,EAAE;qBACvB,CAAC,CAAC;oBACH,MAAM,GAAG,GAAG,eAAe,YAAY,GACrC,GAAG,CAAC,OAAO,CAAC,SACd,KAAK,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;oBAElE,EAAE,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE;wBAChC,oBAAoB,EAAE,KAAK;wBAC3B,eAAe,EAAE,GAAG,CAAC,OAAO,CAAC,cAAc;qBAC5C,CAAC,CAAC;oBACH,IAAI,EAAE,CAAC,YAAY,EAAE;wBACnB,aAAa,GAAG,EAAE,CAAC,YAAY,CAAC;wBAChC,MAAM;qBACP;iBACF;gBACD,IAAI,eAAe,EAAE;oBACnB,MAAM,MAAM,CAAC,UAAU,EAAE,CAAC;iBAC3B;gBACD,IAAI,EAAE,KAAK,SAAS,EAAE;oBACpB,EAAE,GAAG,wBAAmB,CAAC,WAAW,EAAE,CAAC;iBACxC;gBACD,IAAI,aAAa,EAAE;oBAGjB,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;iBACtE;gBACD,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;aAC1D;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;aAC9D;QACH,CAAC;KAAA;IAEM,MAAM,CAAO,QAAQ,CAC1B,GAAoB;;YAEpB,MAAM,OAAO,GAAG,8BAAoB,CAAC,QAAQ,CAAC;YAE9C,MAAM,KAAK,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;YACnC,IAAI,aAAa,GAAG,EAAE,CAAC;YACvB,IAAI,EAAuB,CAAC;YAE5B,IAAI;gBACF,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;gBACnC,IAAI,eAAe,GAAG,KAAK,CAAC;gBAC5B,IAAI,CAAC,MAAM,CAAC,WAAW,IAAI,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,cAAc,EAAE;oBACpE,eAAe,GAAG,IAAI,CAAC;oBACvB,aAAa,GAAG,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC;iBACxC;gBACD,EAAE,GAAG,wBAAmB,CAAC,WAAW,EAAE,CAAC;gBACvC,IAAI,CAAC,aAAa,EAAE;oBAClB,QAAQ,MAAM,CAAC,gBAAgB,EAAE,CAAC,MAAM,EAAE;wBACxC,KAAK,WAAM,CAAC,KAAK,CAAC;wBAClB,KAAK,WAAM,CAAC,KAAK,CAAC;wBAClB,KAAK,WAAM,CAAC,KAAK;4BACf,aAAa,GAAG,gBAAgB,CAAC;4BACjC,MAAM;wBACR;4BACE;gCACE,IAAI,EAAE,GAAG,EAAE,CAAC;gCACZ,IAAI,IAAI,GAAG,EAAE,CAAC;gCACd,IAAI,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE;oCAC1B,EAAE,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,UAAU,GAAG,CAAC;iCACnC;gCACD,IAAI,GAAG,CAAC,OAAO,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;oCACzD,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;iCACtC;qCAAM;oCACL,IAAI,GAAG,GAAG,CAAC;iCACZ;gCACD,EAAE,GAAG,MAAM,MAAM,CAAC,UAAU,CAC1B,UAAU,IAAI,SAAS,EAAE,GAAG,GAAG,CAAC,OAAO,CAAC,SAAS,GAAG,EACpD;oCACE,oBAAoB,EAAE,KAAK;oCAC3B,eAAe,EAAE,GAAG,CAAC,OAAO,CAAC,cAAc;oCAC3C,iBAAiB,EAAE,CAAC,OAAe,EAAE,QAAgB,EAAE,EAAE;wCACvD,IAAI,CAAC,YAAY,CACf,0BAA0B,EAC1B,OAAO,EACP,QAAQ,EACR;4CACE,IAAI,EAAE,MAAM,CAAC,OAAO,EAAE;yCACvB,CACF,CAAC;oCACJ,CAAC;iCACF,CACF,CAAC;gCACF,IAAI,EAAE,CAAC,YAAY,EAAE;oCACnB,aAAa,GAAG,EAAE,CAAC,YAAY,CAAC;iCACjC;6BACF;4BACD,MAAM;qBACT;oBACD,IAAI,eAAe,EAAE;wBACnB,MAAM,MAAM,CAAC,UAAU,EAAE,CAAC;qBAC3B;iBACF;gBACD,IAAI,aAAa,EAAE;oBACjB,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;iBACtE;gBACD,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;aAC1D;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;aAC9D;QACH,CAAC;KAAA;IAEM,MAAM,CAAO,UAAU,CAC5B,GAAsB;;YAEtB,MAAM,OAAO,GAAG,8BAAoB,CAAC,UAAU,CAAC;YAChD,MAAM,KAAK,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;YACnC,IAAI;gBACF,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;gBACnC,MAAM,WAAW,GAAsB;oBACrC,oBAAoB,EAAE,GAAG,CAAC,OAAO,CAAC,kBAAkB;oBACpD,eAAe,EAAE,GAAG,CAAC,OAAO,CAAC,cAAc;oBAC3C,iBAAiB,EAAE,CAAC,OAAe,EAAE,QAAgB,EAAE,EAAE;wBACvD,IAAI,CAAC,YAAY,CAAC,0BAA0B,EAAE,OAAO,EAAE,QAAQ,EAAE;4BAC/D,IAAI,EAAE,MAAM,CAAC,OAAO,EAAE;yBACvB,CAAC,CAAC;oBACL,CAAC;iBACF,CAAC;gBACF,IAAI,GAAG,CAAC,OAAO,EAAE;oBACf,WAAW,CAAC,QAAQ,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC;iBAC5C;gBACD,IAAI,oBAAoB,GAAG,KAAK,CAAC;gBACjC,IAAI,eAAe,GAAG,KAAK,CAAC;gBAC5B,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;oBACvB,IAAI,WAAW,CAAC,eAAe,EAAE;wBAC/B,eAAe,GAAG,IAAI,CAAC;wBACvB,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC;qBACxB;yBAAM;wBACL,oBAAoB,GAAG,IAAI,CAAC;qBAC7B;iBACF;gBACD,IAAI,oBAAoB,EAAE;oBACxB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;iBACzC;qBAAM;oBACL,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;oBACjE,IAAI,CAAC,YAAY,CACf,0BAA0B,EAC1B,qBAAqB,EACrB,EAAE,EACF,EAAE,IAAI,EAAE,MAAM,CAAC,OAAO,EAAE,EAAE,CAC3B,CAAC;oBACF,IAAI,eAAe,EAAE;wBACnB,MAAM,MAAM,CAAC,UAAU,EAAE,CAAC;qBAC3B;oBACD,IAAI,EAAE,CAAC,YAAY,EAAE;wBACnB,OAAO,IAAI,CAAC,cAAc,CACxB,OAAO,EACP,KAAK,EACL,EAAE,CAAC,YAAY,EACf,KAAK,EACL,EAAE,CACH,CAAC;qBACH;oBACD,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;iBAC1D;aACF;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;aAC9D;QACH,CAAC;KAAA;IAEM,MAAM,CAAO,WAAW,CAC7B,GAAuB;;YAEvB,MAAM,OAAO,GAAG,8BAAoB,CAAC,WAAW,CAAC;YACjD,MAAM,KAAK,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;YACnC,IAAI;gBACF,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;gBACnC,MAAM,WAAW,GAAsB;oBACrC,iBAAiB,EAAE,CAAC,OAAe,EAAE,QAAgB,EAAE,EAAE;wBACvD,IAAI,CAAC,YAAY,CAAC,wBAAwB,EAAE,OAAO,EAAE,QAAQ,EAAE;4BAC7D,IAAI,EAAE,MAAM,CAAC,OAAO,EAAE;yBACvB,CAAC,CAAC;oBACL,CAAC;iBACF,CAAC;gBACF,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;gBACvE,IAAI,CAAC,YAAY,CAAC,wBAAwB,EAAE,qBAAqB,EAAE,EAAE,EAAE;oBACrE,IAAI,EAAE,MAAM,CAAC,OAAO,EAAE;iBACvB,CAAC,CAAC;gBACH,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;aAC5D;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;aAC9D;QACH,CAAC;KAAA;IAEM,MAAM,CAAO,oBAAoB,CACtC,GAAuB;;YAEvB,MAAM,OAAO,GAAG,8BAAoB,CAAC,oBAAoB,CAAC;YAE1D,MAAM,KAAK,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;YACnC,IAAI;gBACF,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;gBACnC,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC;gBACrD,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;aAC9D;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;aAC9D;QACH,CAAC;KAAA;IAEO,MAAM,CAAC,SAAS,CAAC,GAA4B;QACnD,OAAO,mCAAgB,CAAC,WAAW,EAAE,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IACxE,CAAC;IAEO,MAAM,CAAC,YAAY,CACzB,MAAc,EACd,OAAe,EACf,QAAgB,EAChB,OAAa;IAMf,CAAC;IAEO,MAAM,CAAC,cAAc,CAC3B,OAA6B,EAC7B,EAAW,EACX,OAAe,EACf,KAAa,EACb,MAAY;QAEZ,MAAM,CAAC,GAAsB;YAC3B,OAAO;YACP,EAAE;YACF,OAAO;YACP,YAAY,EAAE,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK;YAC1C,MAAM;SACP,CAAC;QACF,OAAO,CAAC,CAAC;IACX,CAAC;CACF;AA3XD,0CA2XC"}
+{"version":3,"file":"DBAccessService.js","sourceRoot":"","sources":["../../../src/service/DBAccessService.ts"],"names":[],"mappings":"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"}

package/built/src/service/DBDriverResolver.d.ts

@@ -12,5 +12,6 @@ export declare class DBDriverResolver {
     getSettingByName(defName: string): ConnectionSetting;
     getDriverById(connectionId: string): BaseDriver;
     createDriver(setting: ConnectionSetting): BaseDriver;
+    removeDriver(driver: BaseDriver): void;
     closeAll(): Promise<string>;
 }

package/built/src/service/DBDriverResolver.js

@@ -65,6 +65,9 @@ class DBDriverResolver {
         this.driverMap.set(conRes.id, driver);
         return driver;
     }
+    removeDriver(driver) {
+        this.driverMap.delete(driver.getConnectionRes().id);
+    }
     closeAll() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             let errorMessage = '';
@@ -76,6 +79,7 @@ class DBDriverResolver {
                     errorMessage += e.message + '\n';
                 }
             }));
+            this.driverMap.clear();
             return errorMessage;
         });
     }

package/built/src/service/DBDriverResolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"DBDriverResolver.js","sourceRoot":"","sources":["../../../src/service/DBDriverResolver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DBDriverResolver.js","sourceRoot":"","sources":["../../../src/service/DBDriverResolver.ts"],"names":[],"mappings":"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"}

package/built/src/service/request/index.d.ts

@@ -19,8 +19,9 @@ export interface TestConnectionSettingRequest {
 export interface ConnectRequest {
     connectionName: string;
 }
-export interface ViewDataRequest extends RequestInConnectedState<{
+export interface ViewDataRequest extends GeneralDBRequest<{
     autoConnection?: boolean;
+    connectionName?: string;
     schemaName?: string;
     tableName: string;
     columns?: string[];
@@ -30,12 +31,12 @@ export interface ListProposalsRequest extends RequestInConnectedState {
     keyword?: string;
 }
 export interface ExecuteSqlRequest extends GeneralDBRequest<{
-    needsColumnResolve?: boolean;
     autoConnection?: boolean;
+    connectionName?: string;
+    needsColumnResolve?: boolean;
     maxRows?: number;
     sql: string;
 }> {
-    connectionId: string;
 }
 export interface CountTablesRequest extends GeneralDBRequest<{
     tables: SchemaAndTableHints;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@l-v-yonsama/multi-platform-database-drivers",
-  "version": "0.1.24",
+  "version": "0.1.28",
   "description": "multi-platform database drivers in TypeScript.",
   "engines": {
     "node": ">= 16 <19"