From 5c99db9edbe7bfc51d5e845ace9c0b74cebb9916 Mon Sep 17 00:00:00 2001 From: Simon Smith Date: Mon, 6 Nov 2023 13:54:17 +0000 Subject: [PATCH] fix postgres sqlbatch (#5514) Signed-off-by: si458 --- db.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/db.js b/db.js index 046a32b7..8e45d8d1 100644 --- a/db.js +++ b/db.js @@ -1316,7 +1316,7 @@ module.exports.CreateDB = function (parent, func) { .catch(function (err) { conn.release(); if (func) { try { func(err); } catch (ex) { console.log(ex); } } }); }) .catch(function (err) { if (func) { try { func(err); } catch (ex) { console.log(ex); } } }); - } else if ((obj.databaseType == 5) || (obj.databaseType == 6)) { // MySQL + } else if (obj.databaseType == 5) { // MySQL Datastore.getConnection(function(err, connection) { if (err) { if (func) { try { func(err); } catch (ex) { console.log(ex); } } return; } var Promises = []; @@ -1325,6 +1325,12 @@ module.exports.CreateDB = function (parent, func) { .then(function (error, results, fields) { connection.release(); if (func) { try { func(error, results); } catch (ex) { console.log(ex); } } }) .catch(function (error, results, fields) { connection.release(); if (func) { try { func(error); } catch (ex) { console.log(ex); } } }); }); + } else if (obj.databaseType == 6) { // Postgres + var Promises = []; + for (var i in queries) { if (typeof queries[i] == 'string') { Promises.push(Datastore.query(queries[i])); } else { Promises.push(Datastore.query(queries[i][0], queries[i][1])); } } + Promise.all(Promises) + .then(function (error, results, fields) { if (func) { try { func(error, results); } catch (ex) { console.log(ex); } } }) + .catch(function (error, results, fields) { if (func) { try { func(error); } catch (ex) { console.log(ex); } } }); } }