Bump to version 0.2.20-3

loyaltylion · Nov 20, 2020 · fb16ecd · fb16ecd
1 parent a2fd785
commit fb16ecd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@loyaltylion/typeorm",
   "private": true,
-  "version": "0.2.20-2",
+  "version": "0.2.29-3",
   "description": "loyaltylion fork",
   "license": "MIT",
   "readmeFilename": "README.md",

diff --git a/src/driver/postgres/PostgresDriver.ts b/src/driver/postgres/PostgresDriver.ts
@@ -2,6 +2,7 @@ import {Driver} from "../Driver";
 import {ConnectionIsNotSetError} from "../../error/ConnectionIsNotSetError";
 import {ObjectLiteral} from "../../common/ObjectLiteral";
 import {DriverPackageNotInstalledError} from "../../error/DriverPackageNotInstalledError";
+import {DriverUtils} from "../DriverUtils";
 import {ColumnMetadata} from "../../metadata/ColumnMetadata";
 import {PostgresQueryRunner} from "./PostgresQueryRunner";
 import {DateUtils} from "../../util/DateUtils";

diff --git a/src/query-builder/SelectQueryBuilder.ts b/src/query-builder/SelectQueryBuilder.ts
@@ -1065,6 +1065,13 @@ export class SelectQueryBuilder<Entity> extends QueryBuilder<Entity> implements
 
         } catch (error) {
 
+            // rollback transaction if we started it
+            if (transactionStartedByUs) {
+                try {
+                    await queryRunner.rollbackTransaction();
+                } catch (rollbackError) { }
+            }
+            throw error;
 
         } finally {
             if (queryRunner !== this.queryRunner) { // means we created our own query runner