close dbhandles after shell script (missing tableReader)

packages/api/src/shell/dataDuplicator.js

@@ -19,16 +19,18 @@ async function dataDuplicator({
   systemConnection,
 }) {
   if (!driver) driver = requireEngineDriver(connection);
-  const pool = systemConnection || (await connectUtility(driver, connection, 'write'));
   
+  const dbhan = systemConnection || (await connectUtility(driver, connection, 'write'));
+
+  try {
     logger.info(`Connected.`);
 
     if (!analysedStructure) {
-    analysedStructure = await driver.analyseFull(pool);
+      analysedStructure = await driver.analyseFull(dbhan);
     }
 
     const dupl = new DataDuplicator(
-    pool,
+      dbhan,
       driver,
       analysedStructure,
       items.map(item => ({
@@ -45,6 +47,11 @@ async function dataDuplicator({
     );
 
     await dupl.run();
+  } finally {
+    if (!systemConnection) {
+      await driver.close(dbhan);
+    }
+  }
 }
 
 module.exports = dataDuplicator;

packages/api/src/shell/dumpDatabase.js

@@ -27,15 +27,23 @@ async function dumpDatabase({
   logger.info(`Dumping database`);
 
   if (!driver) driver = requireEngineDriver(connection);
-  const pool = systemConnection || (await connectUtility(driver, connection, 'read', { forceRowsAsObjects: true }));
+
+  const dbhan = systemConnection || (await connectUtility(driver, connection, 'read', { forceRowsAsObjects: true }));
+
+  try {
     logger.info(`Connected.`);
 
-  const dumper = await driver.createBackupDumper(pool, {
+    const dumper = await driver.createBackupDumper(dbhan, {
       outputFile,
       databaseName,
       schemaName,
     });
     await doDump(dumper);
+  } finally {
+    if (!systemConnection) {
+      await driver.close(dbhan);
+    }
+  }
 }
 
 module.exports = dumpDatabase;

packages/api/src/shell/executeQuery.js

@@ -9,13 +9,16 @@ async function executeQuery({ connection = undefined, systemConnection = undefin
 
   if (!driver) driver = requireEngineDriver(connection);
   const dbhan = systemConnection || (await connectUtility(driver, connection, 'script'));
+
+  try {
     logger.info(`Connected.`);
 
     await driver.script(dbhan, sql);
-
+  } finally {
     if (!systemConnection) {
       await driver.close(dbhan);
     }
+  }
 }
 
 module.exports = executeQuery;

packages/api/src/shell/generateDeploySql.js

@@ -22,6 +22,8 @@ async function generateDeploySql({
   if (!driver) driver = requireEngineDriver(connection);
 
   const dbhan = systemConnection || (await connectUtility(driver, connection, 'read'));
+
+  try {
     if (!analysedStructure) {
       analysedStructure = await driver.analyseFull(dbhan);
     }
@@ -56,10 +58,12 @@ async function generateDeploySql({
       driver
     );
     
+    return res;
+  } finally {
     if (!systemConnection) {
       await driver.close(dbhan);
     }
-  return res;
+  }
 }
 
 module.exports = generateDeploySql;

packages/api/src/shell/importDatabase.js

@@ -59,6 +59,7 @@ async function importDatabase({ connection = undefined, systemConnection = undef
 
   if (!driver) driver = requireEngineDriver(connection);
   const dbhan = systemConnection || (await connectUtility(driver, connection, 'write'));
+  try {
     logger.info(`Connected.`);
 
     logger.info(`Input file: ${inputFile}`);
@@ -74,6 +75,11 @@ async function importDatabase({ connection = undefined, systemConnection = undef
     // @ts-ignore
     splittedStream.pipe(importStream);
     await awaitStreamEnd(importStream);
+  } finally {
+    if (!systemConnection) {
+      await driver.close(dbhan);
+    }
+  }
 }
 
 module.exports = importDatabase;

packages/api/src/shell/loadDatabase.js

@@ -9,13 +9,19 @@ async function loadDatabase({ connection = undefined, systemConnection = undefin
   logger.info(`Analysing database`);
 
   if (!driver) driver = requireEngineDriver(connection);
-  const pool = systemConnection || (await connectUtility(driver, connection, 'read', { forceRowsAsObjects: true }));
+  const dbhan = systemConnection || (await connectUtility(driver, connection, 'read', { forceRowsAsObjects: true }));
+  try {
     logger.info(`Connected.`);
 
-  const dbInfo = await driver.analyseFull(pool);
+    const dbInfo = await driver.analyseFull(dbhan);
     logger.info(`Analyse finished`);
 
     await exportDbModel(dbInfo, outputDir);
+  } finally {
+    if (!systemConnection) {
+      await driver.close(dbhan);
+    }
+  }
 }
 
 module.exports = loadDatabase;

packages/api/src/shell/tableReader.js

@@ -3,9 +3,9 @@ const requireEngineDriver = require('../utility/requireEngineDriver');
 const connectUtility = require('../utility/connectUtility');
 const logger = getLogger('tableReader');
 
-async function tableReader({ connection, pureName, schemaName }) {
+async function tableReader({ connection, systemConnection, pureName, schemaName }) {
   const driver = requireEngineDriver(connection);
-  const pool = await connectUtility(driver, connection, 'read');
+  const dbhan = systemConnection || (await connectUtility(driver, connection, 'read'));
   logger.info(`Connected.`);
 
   const fullName = { pureName, schemaName };
@@ -14,26 +14,26 @@ async function tableReader({ connection, pureName, schemaName }) {
     // @ts-ignore
     logger.info(`Reading collection ${fullNameToString(fullName)}`);
     // @ts-ignore
-    return await driver.readQuery(pool, JSON.stringify(fullName));
+    return await driver.readQuery(dbhan, JSON.stringify(fullName));
   }
 
-  const table = await driver.analyseSingleObject(pool, fullName, 'tables');
+  const table = await driver.analyseSingleObject(dbhan, fullName, 'tables');
   const query = `select * from ${quoteFullName(driver.dialect, fullName)}`;
   if (table) {
     // @ts-ignore
     logger.info(`Reading table ${fullNameToString(table)}`);
     // @ts-ignore
-    return await driver.readQuery(pool, query, table);
+    return await driver.readQuery(dbhan, query, table);
   }
-  const view = await driver.analyseSingleObject(pool, fullName, 'views');
+  const view = await driver.analyseSingleObject(dbhan, fullName, 'views');
   if (view) {
     // @ts-ignore
     logger.info(`Reading view ${fullNameToString(view)}`);
     // @ts-ignore
-    return await driver.readQuery(pool, query, view);
+    return await driver.readQuery(dbhan, query, view);
   }
 
-  return await driver.readQuery(pool, query);
+  return await driver.readQuery(dbhan, query);
 }
 
 module.exports = tableReader;

packages/api/src/shell/tableWriter.js

@@ -9,10 +9,16 @@ async function tableWriter({ connection, schemaName, pureName, driver, systemCon
   if (!driver) {
     driver = requireEngineDriver(connection);
   }
-  const pool = systemConnection || (await connectUtility(driver, connection, 'write'));
+  const dbhan = systemConnection || (await connectUtility(driver, connection, 'write'));
 
+  try {
     logger.info(`Connected.`);
-  return await driver.writeTable(pool, { schemaName, pureName }, options);
+    return await driver.writeTable(dbhan, { schemaName, pureName }, options);
+  } finally {
+    if (!systemConnection) {
+      await driver.close(dbhan);
+    }
+  }
 }
 
 module.exports = tableWriter;