typeorm 0.3.23-dev.cebd63b → 0.3.23-dev.fadad1a

package/driver/spanner/SpannerQueryRunner.js

@@ -1,10 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SpannerQueryRunner = void 0;
+const error_1 = require("../../error");
 const QueryFailedError_1 = require("../../error/QueryFailedError");
 const QueryRunnerAlreadyReleasedError_1 = require("../../error/QueryRunnerAlreadyReleasedError");
 const TransactionNotStartedError_1 = require("../../error/TransactionNotStartedError");
 const BaseQueryRunner_1 = require("../../query-runner/BaseQueryRunner");
+const QueryResult_1 = require("../../query-runner/QueryResult");
 const Table_1 = require("../../schema-builder/table/Table");
 const TableCheck_1 = require("../../schema-builder/table/TableCheck");
 const TableColumn_1 = require("../../schema-builder/table/TableColumn");
@@ -13,12 +15,10 @@ const TableIndex_1 = require("../../schema-builder/table/TableIndex");
 const TableUnique_1 = require("../../schema-builder/table/TableUnique");
 const View_1 = require("../../schema-builder/view/View");
 const Broadcaster_1 = require("../../subscriber/Broadcaster");
+const BroadcasterResult_1 = require("../../subscriber/BroadcasterResult");
 const OrmUtils_1 = require("../../util/OrmUtils");
 const Query_1 = require("../Query");
-const error_1 = require("../../error");
-const QueryResult_1 = require("../../query-runner/QueryResult");
 const MetadataTableType_1 = require("../types/MetadataTableType");
-const BroadcasterResult_1 = require("../../subscriber/BroadcasterResult");
 /**
  * Runs queries on a single postgres database connection.
  */
@@ -110,10 +110,12 @@ class SpannerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     async query(query, parameters, useStructuredResult = false) {
         if (this.isReleased)
             throw new QueryRunnerAlreadyReleasedError_1.QueryRunnerAlreadyReleasedError();
+        await this.connect();
+        this.driver.connection.logger.logQuery(query, parameters, this);
+        await this.broadcaster.broadcast("BeforeQuery", query, parameters);
         const broadcasterResult = new BroadcasterResult_1.BroadcasterResult();
         try {
-            const queryStartTime = +new Date();
-            await this.connect();
+            const queryStartTime = Date.now();
             let rawResult = undefined;
             const isSelect = query.startsWith("SELECT");
             const executor = isSelect && !this.isTransactionActive
@@ -123,8 +125,6 @@ class SpannerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 await this.sessionTransaction.begin();
             }
             try {
-                this.driver.connection.logger.logQuery(query, parameters, this);
-                this.broadcaster.broadcastBeforeQueryEvent(broadcasterResult, query, parameters);
                 rawResult = await executor.run({
                     sql: query,
                     params: parameters
@@ -150,7 +150,7 @@ class SpannerQueryRunner extends BaseQueryRunner_1.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;
             this.broadcaster.broadcastAfterQueryEvent(broadcasterResult, query, parameters, true, queryExecutionTime, rawResult, undefined);
             if (maxQueryExecutionTime &&
@@ -187,12 +187,12 @@ class SpannerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             throw new QueryRunnerAlreadyReleasedError_1.QueryRunnerAlreadyReleasedError();
         this.driver.connection.logger.logQuery(query, parameters, this);
         try {
-            const queryStartTime = +new Date();
+            const queryStartTime = Date.now();
             const [operation] = await this.driver.instanceDatabase.updateSchema(query);
             await operation.promise();
             // 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)