Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: drop SAP statement after prepare per Hana client docs #7748

Merged
merged 1 commit into from
Jul 11, 2021
Merged

fix: drop SAP statement after prepare per Hana client docs #7748

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
171 changes: 95 additions & 76 deletions src/driver/sap/SapQueryRunner.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,82 +184,101 @@ export class SapQueryRunner extends BaseQueryRunner implements QueryRunner {
}

const promise = new Promise(async (ok, fail) => {
try {
const databaseConnection = await this.connect();
// we disable autocommit because ROLLBACK does not work in autocommit mode
databaseConnection.setAutoCommit(!this.isTransactionActive);
this.driver.connection.logger.logQuery(query, parameters, this);
const queryStartTime = +new Date();
const isInsertQuery = query.substr(0, 11) === "INSERT INTO";

const statement = databaseConnection.prepare(query);
statement.exec(parameters, (err: any, raw: any) => {

// log slow queries if maxQueryExecution time is set
const maxQueryExecutionTime = this.driver.options.maxQueryExecutionTime;
const queryEndTime = +new Date();
const queryExecutionTime = queryEndTime - queryStartTime;
if (maxQueryExecutionTime && queryExecutionTime > maxQueryExecutionTime)
this.driver.connection.logger.logQuerySlow(queryExecutionTime, query, parameters, this);

const resolveChain = () => {
if (promiseIndex !== -1)
this.queryResponsibilityChain.splice(promiseIndex, 1);
if (waitingPromiseIndex !== -1)
this.queryResponsibilityChain.splice(waitingPromiseIndex, 1);
waitingOkay();
};

let promiseIndex = this.queryResponsibilityChain.indexOf(promise);
let waitingPromiseIndex = this.queryResponsibilityChain.indexOf(waitingPromise);
if (err) {
this.driver.connection.logger.logQueryError(err, query, parameters, this);
resolveChain();
return fail(new QueryFailedError(query, parameters, err));

} else {
const result = new QueryResult();

if (typeof raw === "number") {
result.affected = raw;
} else if (Array.isArray(raw)) {
result.records = raw;
}

if (isInsertQuery) {
const lastIdQuery = `SELECT CURRENT_IDENTITY_VALUE() FROM "SYS"."DUMMY"`;
this.driver.connection.logger.logQuery(lastIdQuery, [], this);
databaseConnection.exec(lastIdQuery, (err: any, identityValueResult: { "CURRENT_IDENTITY_VALUE()": number }[]) => {
if (err) {
this.driver.connection.logger.logQueryError(err, lastIdQuery, [], this);
resolveChain();
fail(new QueryFailedError(lastIdQuery, [], err));
return;
}

result.raw = identityValueResult[0]["CURRENT_IDENTITY_VALUE()"];
result.records = identityValueResult;

if (useStructuredResult) {
ok(result);
} else {
ok(result.raw);
}
resolveChain();
});
} else {
result.raw = raw;

if (useStructuredResult) {
ok(result);
} else {
ok(result.raw);
}
resolveChain();
}
}
});
} catch (err) {
const resolveChain = () => {
let promiseIndex = this.queryResponsibilityChain.indexOf(promise);
let waitingPromiseIndex = this.queryResponsibilityChain.indexOf(waitingPromise);

if (promiseIndex !== -1)
this.queryResponsibilityChain.splice(promiseIndex, 1);
if (waitingPromiseIndex !== -1)
this.queryResponsibilityChain.splice(waitingPromiseIndex, 1);

waitingOkay();
};

let statement: any;

const dropStatement = async () => {
return new Promise<void>((ok, fail) => {
if (!statement?.drop) {
ok();
}

statement.drop(() => ok());
});
};

try {
const databaseConnection = await this.connect();
// we disable autocommit because ROLLBACK does not work in autocommit mode
databaseConnection.setAutoCommit(!this.isTransactionActive);
this.driver.connection.logger.logQuery(query, parameters, this);
const queryStartTime = +new Date();
const isInsertQuery = query.substr(0, 11) === "INSERT INTO";

statement = databaseConnection.prepare(query);
statement.exec(parameters, async (err: any, raw: any) => {
// log slow queries if maxQueryExecution time is set
const maxQueryExecutionTime = this.driver.connection.options.maxQueryExecutionTime;
const queryEndTime = +new Date();
const queryExecutionTime = queryEndTime - queryStartTime;
if (maxQueryExecutionTime && queryExecutionTime > maxQueryExecutionTime)
this.driver.connection.logger.logQuerySlow(queryExecutionTime, query, parameters, this);

if (err) {
this.driver.connection.logger.logQueryError(err, query, parameters, this);
await dropStatement();
resolveChain();
fail(new QueryFailedError(query, parameters, err));
return;
}

const result = new QueryResult();

if (typeof raw === "number") {
result.affected = raw;
} else if (Array.isArray(raw)) {
result.records = raw;
}

result.raw = raw;

if (isInsertQuery) {
const lastIdQuery = `SELECT CURRENT_IDENTITY_VALUE() FROM "SYS"."DUMMY"`;
this.driver.connection.logger.logQuery(lastIdQuery, [], this);
databaseConnection.exec(lastIdQuery, async (err: any, identityValueResult: { "CURRENT_IDENTITY_VALUE()": number }[]) => {
if (err) {
this.driver.connection.logger.logQueryError(err, lastIdQuery, [], this);
await dropStatement();
resolveChain();
fail(new QueryFailedError(lastIdQuery, [], err));
return;
}

result.raw = identityValueResult[0]["CURRENT_IDENTITY_VALUE()"];
result.records = identityValueResult;

await dropStatement();
if (useStructuredResult) {
ok(result);
} else {
ok(result.raw);
}
resolveChain();
});
} else {
await dropStatement();
if (useStructuredResult) {
ok(result);
} else {
ok(result.raw);
}
resolveChain();
}
});
} catch (err) {
await dropStatement();
resolveChain();
fail(err);
}
});
Expand Down