typeorm 0.3.23-dev.c15cb07 → 0.3.23-dev.fadad1a

package/browser/driver/cockroachdb/CockroachQueryRunner.js

@@ -1,24 +1,24 @@
-import { QueryResult } from "../../query-runner/QueryResult";
+import { TypeORMError } from "../../error";
+import { QueryFailedError } from "../../error/QueryFailedError";
+import { QueryRunnerAlreadyReleasedError } from "../../error/QueryRunnerAlreadyReleasedError";
 import { TransactionNotStartedError } from "../../error/TransactionNotStartedError";
-import { TableColumn } from "../../schema-builder/table/TableColumn";
+import { BaseQueryRunner } from "../../query-runner/BaseQueryRunner";
+import { QueryResult } from "../../query-runner/QueryResult";
 import { Table } from "../../schema-builder/table/Table";
-import { TableIndex } from "../../schema-builder/table/TableIndex";
+import { TableCheck } from "../../schema-builder/table/TableCheck";
+import { TableColumn } from "../../schema-builder/table/TableColumn";
+import { TableExclusion } from "../../schema-builder/table/TableExclusion";
 import { TableForeignKey } from "../../schema-builder/table/TableForeignKey";
-import { QueryRunnerAlreadyReleasedError } from "../../error/QueryRunnerAlreadyReleasedError";
+import { TableIndex } from "../../schema-builder/table/TableIndex";
+import { TableUnique } from "../../schema-builder/table/TableUnique";
 import { View } from "../../schema-builder/view/View";
-import { Query } from "../Query";
-import { QueryFailedError } from "../../error/QueryFailedError";
 import { Broadcaster } from "../../subscriber/Broadcaster";
-import { TableUnique } from "../../schema-builder/table/TableUnique";
-import { BaseQueryRunner } from "../../query-runner/BaseQueryRunner";
-import { OrmUtils } from "../../util/OrmUtils";
-import { TableCheck } from "../../schema-builder/table/TableCheck";
-import { TableExclusion } from "../../schema-builder/table/TableExclusion";
-import { TypeORMError } from "../../error";
-import { MetadataTableType } from "../types/MetadataTableType";
-import { InstanceChecker } from "../../util/InstanceChecker";
 import { BroadcasterResult } from "../../subscriber/BroadcasterResult";
+import { InstanceChecker } from "../../util/InstanceChecker";
+import { OrmUtils } from "../../util/OrmUtils";
 import { VersionUtils } from "../../util/VersionUtils";
+import { Query } from "../Query";
+import { MetadataTableType } from "../types/MetadataTableType";
 /**
  * Runs queries on a single postgres database connection.
  */
@@ -193,10 +193,10 @@ export class CockroachQueryRunner 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);
-        const queryStartTime = +new Date();
+        await this.broadcaster.broadcast("BeforeQuery", query, parameters);
+        const broadcasterResult = new BroadcasterResult();
+        const queryStartTime = Date.now();
         if (this.isTransactionActive && this.storeQueries) {
             this.queries.push({ query, parameters });
         }
@@ -206,7 +206,7 @@ export class CockroachQueryRunner extends BaseQueryRunner {
             });
             // log slow queries if maxQueryExecution time is set
             const maxQueryExecutionTime = this.driver.options.maxQueryExecutionTime;
-            const queryEndTime = +new Date();
+            const queryEndTime = Date.now();
             const queryExecutionTime = queryEndTime - queryStartTime;
             if (maxQueryExecutionTime &&
                 queryExecutionTime > maxQueryExecutionTime) {