Skip to content

Commit 4bacd88

Browse files
SNOW-1926267: Fix promise rejecting for file upload errors
1 parent e76137e commit 4bacd88

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

lib/connection/statement.js

+7-6
Original file line numberDiff line numberDiff line change
@@ -842,18 +842,19 @@ function FileStatementPreExec(
842842
async function executeFileTransferRequest(context, body, statement, fileTransferAgent) {
843843
context.fileMetadata = body;
844844

845-
const fta = typeof fileTransferAgent === 'undefined' ? new FileTransferAgent(context) : fileTransferAgent;
846-
await fta.execute();
845+
const fta = fileTransferAgent ?? new FileTransferAgent(context); await fta.execute();
847846

848847
try {
849848
// build a result from the response
850849
const result = fta.result();
851850

852851
// init result and meta
853-
body.data.rowset = result.rowset;
854-
body.data.returned = body.data.rowset.length;
855-
body.data.rowtype = result.rowtype;
856-
body.data.parameters = [];
852+
body.data = {
853+
rowset: result.rowset,
854+
returned: body.data.rowset.length,
855+
rowtype: result.rowtype,
856+
parameters: [],
857+
};
857858

858859
context.result = new Result({
859860
response: body,

lib/file_transfer_agent/file_transfer_agent.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ function FileTransferAgent(context) {
216216
if (meta['resultStatus'] === 'ERROR') {
217217
errorDetails = meta['errorDetails'];
218218
if (!errorDetails) {
219-
errorDetails = `Unknown error during PUT of file: ${meta['srcFilePath'].toString()}`;
219+
errorDetails = `Unknown error during PUT of file: ${meta['srcFilePath']}`;
220220
}
221221
throw new Error(errorDetails);
222222
}
@@ -234,8 +234,8 @@ function FileTransferAgent(context) {
234234

235235
errorDetails = meta['errorDetails'];
236236

237-
srcFileSize = meta['srcFileSize'].toString();
238-
dstFileSize = meta['dstFileSize'].toString();
237+
srcFileSize = meta['srcFileSize'];
238+
dstFileSize = meta['dstFileSize'];
239239

240240
rowset.push([
241241
meta['srcFileName'],

0 commit comments

Comments
 (0)