typeorm 0.3.18-dev.0f11739 → 0.3.18-dev.173910e

package/browser/driver/postgres/PostgresQueryRunner.js

@@ -18,6 +18,7 @@ import { OrmUtils } from "../../util/OrmUtils";
 import { VersionUtils } from "../../util/VersionUtils";
 import { Query } from "../Query";
 import { MetadataTableType } from "../types/MetadataTableType";
+import { BroadcasterResult } from "../../subscriber/BroadcasterResult";
 /**
  * Runs queries on a single postgres database connection.
  */
@@ -172,7 +173,9 @@ export class PostgresQueryRunner extends BaseQueryRunner {
         if (this.isReleased)
             throw new QueryRunnerAlreadyReleasedError();
         const databaseConnection = await this.connect();
+        const broadcasterResult = new BroadcasterResult();
         this.driver.connection.logger.logQuery(query, parameters, this);
+        this.broadcaster.broadcastBeforeQueryEvent(broadcasterResult, query, parameters);
         try {
             const queryStartTime = +new Date();
             const raw = await databaseConnection.query(query, parameters);
@@ -180,6 +183,7 @@ export class PostgresQueryRunner extends BaseQueryRunner {
             const maxQueryExecutionTime = this.driver.options.maxQueryExecutionTime;
             const queryEndTime = +new Date();
             const queryExecutionTime = queryEndTime - queryStartTime;
+            this.broadcaster.broadcastAfterQueryEvent(broadcasterResult, query, parameters, true, queryExecutionTime, raw, undefined);
             if (maxQueryExecutionTime &&
                 queryExecutionTime > maxQueryExecutionTime)
                 this.driver.connection.logger.logQuerySlow(queryExecutionTime, query, parameters, this);
@@ -208,8 +212,12 @@ export class PostgresQueryRunner extends BaseQueryRunner {
         }
         catch (err) {
             this.driver.connection.logger.logQueryError(err, query, parameters, this);
+            this.broadcaster.broadcastAfterQueryEvent(broadcasterResult, query, parameters, false, undefined, undefined, err);
             throw new QueryFailedError(query, parameters, err);
         }
+        finally {
+            await broadcasterResult.wait();
+        }
     }
     /**
      * Returns raw data stream.