typeorm 0.3.18-dev.c8ee5b1 → 0.3.18-dev.dd59524

package/driver/cockroachdb/CockroachQueryRunner.js

@@ -20,6 +20,7 @@ const TableExclusion_1 = require("../../schema-builder/table/TableExclusion");
 const error_1 = require("../../error");
 const MetadataTableType_1 = require("../types/MetadataTableType");
 const InstanceChecker_1 = require("../../util/InstanceChecker");
+const BroadcasterResult_1 = require("../../subscriber/BroadcasterResult");
 const VersionUtils_1 = require("../../util/VersionUtils");
 /**
  * Runs queries on a single postgres database connection.
@@ -65,7 +66,12 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 .then(([connection, release]) => {
                 this.driver.connectedQueryRunners.push(this);
                 this.databaseConnection = connection;
-                this.releaseCallback = release;
+                const onErrorCallback = (err) => this.releaseConnection(err);
+                this.releaseCallback = (err) => {
+                    this.databaseConnection.removeListener("error", onErrorCallback);
+                    release(err);
+                };
+                this.databaseConnection.on("error", onErrorCallback);
                 return this.databaseConnection;
             });
         }
@@ -76,27 +82,41 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 .then(([connection, release]) => {
                 this.driver.connectedQueryRunners.push(this);
                 this.databaseConnection = connection;
-                this.releaseCallback = release;
+                const onErrorCallback = (err) => this.releaseConnection(err);
+                this.releaseCallback = (err) => {
+                    this.databaseConnection.removeListener("error", onErrorCallback);
+                    release(err);
+                };
+                this.databaseConnection.on("error", onErrorCallback);
                 return this.databaseConnection;
             });
         }
         return this.databaseConnectionPromise;
     }
     /**
-     * Releases used database connection.
-     * You cannot use query runner methods once its released.
+     * Release a connection back to the pool, optionally specifying an Error to release with.
+     * Per pg-pool documentation this will prevent the pool from re-using the broken connection.
      */
-    release() {
+    async releaseConnection(err) {
         if (this.isReleased) {
-            return Promise.resolve();
+            return;
         }
         this.isReleased = true;
-        if (this.releaseCallback)
-            this.releaseCallback();
+        if (this.releaseCallback) {
+            this.releaseCallback(err);
+            this.releaseCallback = undefined;
+        }
         const index = this.driver.connectedQueryRunners.indexOf(this);
-        if (index !== -1)
-            this.driver.connectedQueryRunners.splice(index);
-        return Promise.resolve();
+        if (index !== -1) {
+            this.driver.connectedQueryRunners.splice(index, 1);
+        }
+    }
+    /**
+     * Releases used database connection.
+     * You cannot use query runner methods once its released.
+     */
+    release() {
+        return this.releaseConnection();
     }
     /**
      * Starts transaction.
@@ -112,6 +132,7 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             throw err;
         }
         if (this.transactionDepth === 0) {
+            this.transactionDepth += 1;
             await this.query("START TRANSACTION");
             await this.query("SAVEPOINT cockroach_restart");
             if (isolationLevel) {
@@ -119,9 +140,9 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             }
         }
         else {
-            await this.query(`SAVEPOINT typeorm_${this.transactionDepth}`);
+            this.transactionDepth += 1;
+            await this.query(`SAVEPOINT typeorm_${this.transactionDepth - 1}`);
         }
-        this.transactionDepth += 1;
         this.storeQueries = true;
         await this.broadcaster.broadcast("AfterTransactionStart");
     }
@@ -134,17 +155,17 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             throw new TransactionNotStartedError_1.TransactionNotStartedError();
         await this.broadcaster.broadcast("BeforeTransactionCommit");
         if (this.transactionDepth > 1) {
-            await this.query(`RELEASE SAVEPOINT typeorm_${this.transactionDepth - 1}`);
             this.transactionDepth -= 1;
+            await this.query(`RELEASE SAVEPOINT typeorm_${this.transactionDepth}`);
         }
         else {
             this.storeQueries = false;
+            this.transactionDepth -= 1;
             await this.query("RELEASE SAVEPOINT cockroach_restart");
             await this.query("COMMIT");
             this.queries = [];
             this.isTransactionActive = false;
             this.transactionRetries = 0;
-            this.transactionDepth -= 1;
         }
         await this.broadcaster.broadcast("AfterTransactionCommit");
     }
@@ -157,16 +178,17 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             throw new TransactionNotStartedError_1.TransactionNotStartedError();
         await this.broadcaster.broadcast("BeforeTransactionRollback");
         if (this.transactionDepth > 1) {
-            await this.query(`ROLLBACK TO SAVEPOINT typeorm_${this.transactionDepth - 1}`);
+            this.transactionDepth -= 1;
+            await this.query(`ROLLBACK TO SAVEPOINT typeorm_${this.transactionDepth}`);
         }
         else {
             this.storeQueries = false;
+            this.transactionDepth -= 1;
             await this.query("ROLLBACK");
             this.queries = [];
             this.isTransactionActive = false;
             this.transactionRetries = 0;
         }
-        this.transactionDepth -= 1;
         await this.broadcaster.broadcast("AfterTransactionRollback");
     }
     /**
@@ -176,7 +198,9 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         if (this.isReleased)
             throw new QueryRunnerAlreadyReleasedError_1.QueryRunnerAlreadyReleasedError();
         const databaseConnection = await this.connect();
+        const broadcasterResult = new BroadcasterResult_1.BroadcasterResult();
         this.driver.connection.logger.logQuery(query, parameters, this);
+        this.broadcaster.broadcastBeforeQueryEvent(broadcasterResult, query, parameters);
         const queryStartTime = +new Date();
         if (this.isTransactionActive && this.storeQueries) {
             this.queries.push({ query, parameters });
@@ -208,6 +232,7 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 default:
                     result.raw = raw.rows;
             }
+            this.broadcaster.broadcastAfterQueryEvent(broadcasterResult, query, parameters, true, queryExecutionTime, raw, undefined);
             if (useStructuredResult) {
                 return result;
             }
@@ -239,9 +264,13 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             }
             else {
                 this.driver.connection.logger.logQueryError(err, query, parameters, this);
+                this.broadcaster.broadcastAfterQueryEvent(broadcasterResult, query, parameters, false, undefined, undefined, err);
                 throw new QueryFailedError_1.QueryFailedError(query, parameters, err);
             }
         }
+        finally {
+            await broadcasterResult.wait();
+        }
     }
     /**
      * Returns raw data stream.