Skip to content

Commit 46a7dab

Browse files
committed
fix(db): incorrect error handling when no callback is defined
Partly reverts some changes made for the experimental transaction export.
1 parent 8b8670e commit 46a7dab

File tree

3 files changed

+3
-10
lines changed

3 files changed

+3
-10
lines changed

src/database/rawExecute.ts

-2
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,6 @@ export const rawExecute = async (
8383
}
8484
}
8585
} catch (err: any) {
86-
if (!cb) throw new Error(err.message || err);
87-
8886
logError(invokingResource, cb, isPromise, err, query, parameters);
8987
} finally {
9088
connection.release();

src/database/rawQuery.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export const rawQuery = async (
2121
try {
2222
[query, parameters] = parseArguments(query, parameters);
2323
} catch (err: any) {
24-
return logError(invokingResource, cb, err, isPromise, query, parameters);
24+
return logError(invokingResource, cb, isPromise, err, query, parameters);
2525
}
2626

2727
const connection = await getPoolConnection(connectionId);
@@ -54,8 +54,6 @@ export const rawQuery = async (
5454
}
5555
}
5656
} catch (err: any) {
57-
if (!cb) throw new Error(err.message || err);
58-
5957
logError(invokingResource, cb, isPromise, err, query, parameters, true);
6058
} finally {
6159
connection.release();

src/database/startTransaction.ts

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import { getPoolConnection } from './connection';
22
import { logError } from '../logger';
33
import { CFXCallback, CFXParameters } from '../types';
4-
import { rawQuery } from './rawQuery';
5-
import { rawExecute } from './rawExecute';
64

75
export const startTransaction = async (
86
invokingResource: string,
@@ -17,15 +15,14 @@ export const startTransaction = async (
1715
let response = false;
1816

1917
try {
20-
const connectionId = (conn as any).connection.connectionId;
2118
await conn.beginTransaction();
2219

2320
const commit = await queries({
2421
query: (sql: string, values: CFXParameters) => {
25-
return rawQuery(null, invokingResource, sql, values, undefined, isPromise, connectionId);
22+
return conn.query(sql, values);
2623
},
2724
execute: (sql: string, values: CFXParameters) => {
28-
return rawExecute(invokingResource, sql, values, undefined, isPromise, connectionId);
25+
return conn.execute(sql, values);
2926
},
3027
});
3128

0 commit comments

Comments
 (0)