From fb16ecd2332e93a597076b6a6f59b5e67d909283 Mon Sep 17 00:00:00 2001
From: tom <tom@loyaltylion.com>
Date: Fri, 20 Nov 2020 11:57:25 +0000
Subject: [PATCH] Bump to version 0.2.20-3

---
 package.json                            | 2 +-
 src/driver/postgres/PostgresDriver.ts   | 1 +
 src/query-builder/SelectQueryBuilder.ts | 7 +++++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8309a83f59..98cbf1baad 100644
--- 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
index 9d98b426de..3d78dc1da4 100644
--- 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
index 5e9b2483a4..a8a0f3575d 100644
--- 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