Skip to content

Commit

Permalink
[2.3.0] Fix 'new Error'
Browse files Browse the repository at this point in the history
Remove 'new Error' from JavaScript code, as it erases odbc error information from object

Signed-off-by: Mark Irish <[email protected]>
  • Loading branch information
markdirish committed Mar 31, 2020
1 parent 94d0f6c commit d5c67fb
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
18 changes: 9 additions & 9 deletions lib/Connection.js
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ class Connection {
return new Promise((resolve, reject) => {
this.odbcConnection.callProcedure(catalog, schema, name, parameters, (error, result) => {
if (error) {
reject(new Error(error));
reject(error);
} else {
resolve(result);
}
Expand Down Expand Up @@ -139,7 +139,7 @@ class Connection {
return new Promise((resolve, reject) => {
this.odbcConnection.createStatement((error, odbcStatement) => {
if (error) {
reject(new Error(error));
reject(error);
} else {
const statement = new Statement(odbcStatement);
resolve(statement);
Expand Down Expand Up @@ -175,7 +175,7 @@ class Connection {
return new Promise((resolve, reject) => {
this.odbcConnection.close((error) => {
if (error) {
reject(new Error(error));
reject(error);
} else {
resolve();
}
Expand All @@ -194,7 +194,7 @@ class Connection {
return new Promise((resolve, reject) => {
this.odbcConnection.columns(catalog, schema, table, type, (error, result) => {
if (error) {
reject(new Error(error));
reject(error);
} else {
resolve(result);
}
Expand All @@ -214,7 +214,7 @@ class Connection {
return new Promise((resolve, reject) => {
this.odbcConnection.tables(catalog, schema, table, type, (error, result) => {
if (error) {
reject(new Error(error));
reject(error);
} else {
resolve(result);
}
Expand All @@ -234,7 +234,7 @@ class Connection {
return new Promise((resolve, reject) => {
this.odbcConnection.setIsolationLevel(isolationLevel, (error) => {
if (error) {
reject(new Error(error));
reject(error);
} else {
resolve();
}
Expand All @@ -257,7 +257,7 @@ class Connection {
return new Promise((resolve, reject) => {
this.odbcConnection.beginTransaction((error, result) => {
if (error) {
reject(new Error(error));
reject(error);
} else {
resolve(result);
}
Expand All @@ -278,7 +278,7 @@ class Connection {
return new Promise((resolve, reject) => {
this.odbcConnection.commit((error) => {
if (error) {
reject(new Error(error));
reject(error);
} else {
resolve();
}
Expand All @@ -298,7 +298,7 @@ class Connection {
return new Promise((resolve, reject) => {
this.odbcConnection.rollback((error) => {
if (error) {
reject(new Error(error));
reject(error);
} else {
resolve();
}
Expand Down
6 changes: 3 additions & 3 deletions lib/Pool.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ class Pool {
return new Promise((resolve, reject) => {
connection.nativeClose((error, result) => {
if (error) {
reject(new Error(error));
reject(error);
} else {
resolve(result);
}
Expand Down Expand Up @@ -129,7 +129,7 @@ class Pool {
connection.query(sql, parameters, (error, result) => {
// after running, close the connection whether error or not
if (error) {
reject(new Error(error));
reject(error);
} else {
resolve(result);
}
Expand Down Expand Up @@ -189,7 +189,7 @@ class Pool {
await this.increasePoolSize(this.initialSize);
resolve(null);
} catch (error) {
reject(new Error(error));
reject(error);
}
});
}
Expand Down

0 comments on commit d5c67fb

Please sign in to comment.