typeorm 0.3.18-dev.0f11739 → 0.3.18-dev.15bc887

package/browser/driver/spanner/SpannerQueryRunner.js

@@ -15,6 +15,7 @@ import { Query } from "../Query";
 import { TypeORMError } from "../../error";
 import { QueryResult } from "../../query-runner/QueryResult";
 import { MetadataTableType } from "../types/MetadataTableType";
+import { BroadcasterResult } from "../../subscriber/BroadcasterResult";
 /**
  * Runs queries on a single postgres database connection.
  */
@@ -106,6 +107,7 @@ export class SpannerQueryRunner extends BaseQueryRunner {
     async query(query, parameters, useStructuredResult = false) {
         if (this.isReleased)
             throw new QueryRunnerAlreadyReleasedError();
+        const broadcasterResult = new BroadcasterResult();
         try {
             const queryStartTime = +new Date();
             await this.connect();
@@ -119,6 +121,7 @@ export class SpannerQueryRunner extends BaseQueryRunner {
             }
             try {
                 this.driver.connection.logger.logQuery(query, parameters, this);
+                this.broadcaster.broadcastBeforeQueryEvent(broadcasterResult, query, parameters);
                 rawResult = await executor.run({
                     sql: query,
                     params: parameters
@@ -146,6 +149,7 @@ export class SpannerQueryRunner extends BaseQueryRunner {
             const maxQueryExecutionTime = this.driver.options.maxQueryExecutionTime;
             const queryEndTime = +new Date();
             const queryExecutionTime = queryEndTime - queryStartTime;
+            this.broadcaster.broadcastAfterQueryEvent(broadcasterResult, query, parameters, true, queryExecutionTime, rawResult, undefined);
             if (maxQueryExecutionTime &&
                 queryExecutionTime > maxQueryExecutionTime)
                 this.driver.connection.logger.logQuerySlow(queryExecutionTime, query, parameters, this);
@@ -162,9 +166,11 @@ export class SpannerQueryRunner 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();
         }
     }
     /**
@@ -1143,7 +1149,7 @@ export class SpannerQueryRunner extends BaseQueryRunner {
                         dbColumn["GENERATION_EXPRESSION"];
                     tableColumn.generatedType = "STORED";
                     // We cannot relay on information_schema.columns.generation_expression, because it is formatted different.
-                    const asExpressionQuery = await this.selectTypeormMetadataSql({
+                    const asExpressionQuery = this.selectTypeormMetadataSql({
                         table: dbTable["TABLE_NAME"],
                         type: MetadataTableType.GENERATED_COLUMN,
                         name: tableColumn.name,