Skip to content
This repository was archived by the owner on Apr 29, 2025. It is now read-only.

Commit c9acb09

Browse files
committed
refactor: Execute now return whole result object
1 parent 73ad12e commit c9acb09

File tree

1 file changed

+4
-45
lines changed

1 file changed

+4
-45
lines changed

src/index.js

Lines changed: 4 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -14,29 +14,8 @@ const safeCallback = (callback, result) => {
1414
else throw new Error(`Undefined callback passed`);
1515
};
1616

17-
global.exports('execute', (query, parameters, cb, prepare = true, resource = GetInvokingResource()) => {
18-
execute(query, parameters, resource, prepare).then((result) => {
19-
// Unsuccesful query
20-
if (!result) return safeCallback(cb, false);
21-
22-
// Insert query
23-
if (result.insertId !== undefined) return safeCallback(cb, result.insertId);
24-
25-
// Update query
26-
if (result.affectedRows !== undefined) return safeCallback(cb, result.affectedRows);
27-
28-
if (result.length && result.length === 1) {
29-
const values = Object.values(result[0]);
30-
// Single query
31-
if (values.length === 1) return safeCallback(cb, values[0]);
32-
33-
// Scalar query
34-
return safeCallback(cb, result[0]);
35-
}
36-
37-
// Fetch
38-
return safeCallback(cb, result);
39-
});
17+
global.exports('execute', (query, parameters, cb, resource = GetInvokingResource()) => {
18+
execute(query, parameters, resource).then((result) => safeCallback(cb, result));
4019
});
4120

4221
global.exports('insert', (query, parameters, cb, resource = GetInvokingResource()) => {
@@ -61,28 +40,8 @@ global.exports('scalar', (query, parameters, cb, resource = GetInvokingResource(
6140
);
6241
});
6342

64-
/*global.exports('executeSync', async (query, parameters, prepare = true) => {
65-
const result = await execute(query, parameters, GetInvokingResource(), prepare);
66-
67-
// Unsuccesful query
68-
if (!result) return false;
69-
70-
// Insert query
71-
if (result.insertId !== undefined) return result.insertId;
72-
73-
// Update query
74-
if (result.affectedRows !== undefined) return result.affectedRows;
75-
76-
if (result.length && result.length === 1) {
77-
const values = Object.values(result[0]);
78-
// Single query
79-
if (values.length === 1) return values[0];
80-
81-
// Scalar query
82-
return result[0];
83-
}
84-
85-
// Fetch
43+
/*global.exports('executeSync', async (query, parameters) => {
44+
const result = await execute(query, parameters, GetInvokingResource());
8645
return result;
8746
});
8847

0 commit comments

Comments
 (0)