emilsoftware-utilities 1.2.6 → 1.2.8

package/orm.js

@@ -147,16 +147,33 @@ var rollbackTransaction = function (transaction) {
     });
 };
 var executeQueries = function (transaction, queries, params) {
-    return queries.reduce(function (promiseChain, currentQuery, index) {
-        return promiseChain.then(function () { return new Promise(function (resolve, reject) {
-            transaction.query(currentQuery, params[index], function (err, result) {
-                if (err)
-                    return reject(err);
-                else
-                    return resolve(result);
+    try {
+        return queries.reduce(function (promiseChain, currentQuery, index) {
+            return promiseChain.then(function () { return new Promise(function (resolve, reject) {
+                transaction.query(currentQuery, params[index], function (err, result) {
+                    if (err)
+                        return reject(err);
+                    else
+                        return resolve(result);
+                });
+            }); });
+        }, Promise.resolve())
+            .catch(function (error) {
+            return new Promise(function (resolve, reject) {
+                transaction.rollback(function (rollbackErr) {
+                    if (rollbackErr) {
+                        return reject(rollbackErr);
+                    }
+                    else {
+                        return reject(error);
+                    }
+                });
             });
-        }); });
-    }, Promise.resolve());
+        });
+    }
+    catch (error) {
+        throw error;
+    }
 };
 exports.Orm = {
     quote: quote,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "emilsoftware-utilities",
-  "version": "1.2.6",
+  "version": "1.2.8",
   "description": "Utilities for EmilSoftware",
   "main": "index.js",
   "scripts": {

package/src/orm.ts

@@ -116,16 +116,31 @@ const rollbackTransaction = (transaction: Transaction): Promise<any> => {
 }
 
 
-const executeQueries = (transaction: Transaction, queries: string[], params: any[]) => {
-    return queries.reduce((promiseChain: any, currentQuery: any, index: any) => {
-        return promiseChain.then(() => new Promise((resolve, reject): void => {
-            transaction.query(currentQuery, params[index], (err: any, result: any): void => {
-                if (err) return reject(err); else return resolve(result);
+const executeQueries = (transaction: Transaction, queries: string[], params: any[]): Promise<any> => {
+    try {
+        return queries.reduce((promiseChain: Promise<any>, currentQuery: string, index: number) => {
+            return promiseChain.then(() => new Promise((resolve, reject) => {
+                transaction.query(currentQuery, params[index], (err: any, result: any): void => {
+                    if (err) return reject(err);
+                    else return resolve(result);
+                });
+            }));
+        }, Promise.resolve())
+            .catch(error => {
+                return new Promise((resolve, reject) => {
+                    transaction.rollback((rollbackErr: any) => {
+                        if (rollbackErr) {
+                            return reject(rollbackErr);
+                        } else {
+                            return reject(error);
+                        }
+                    });
+                });
             });
-        }));
-    }, Promise.resolve());
-}
-
+    } catch (error) {
+        throw error;
+    }
+};
 
 interface Orm {
     quote: (value: string) => string,

package/src/utilities.ts

@@ -136,7 +136,7 @@ const sendExecMessage = (res: Response, executionObject: any, title: string): Re
         let response = {
             Status: {
                 errorCode: "0", errorDescription: "",
-            }, Sql: sSql, ID: executionObject?.id, Title: title
+            }, Sql: sSql, ID: executionObject?.id, data: executionObject, Title: title
         };
         return res.send(response);
     } catch (error) {

package/utilities.js

@@ -127,7 +127,7 @@ var sendExecMessage = function (res, executionObject, title) {
         var response = {
             Status: {
                 errorCode: "0", errorDescription: "",
-            }, Sql: sSql, ID: executionObject === null || executionObject === void 0 ? void 0 : executionObject.id, Title: title
+            }, Sql: sSql, ID: executionObject === null || executionObject === void 0 ? void 0 : executionObject.id, data: executionObject, Title: title
         };
         return res.send(response);
     }