typeorm 0.2.25 → 0.2.29

package/driver/sqlserver/SqlServerQueryRunner.js

@@ -5,7 +5,6 @@ var QueryFailedError_1 = require("../../error/QueryFailedError");
 var QueryRunnerAlreadyReleasedError_1 = require("../../error/QueryRunnerAlreadyReleasedError");
 var TransactionAlreadyStartedError_1 = require("../../error/TransactionAlreadyStartedError");
 var TransactionNotStartedError_1 = require("../../error/TransactionNotStartedError");
-var index_1 = require("../../index");
 var BaseQueryRunner_1 = require("../../query-runner/BaseQueryRunner");
 var Table_1 = require("../../schema-builder/table/Table");
 var TableCheck_1 = require("../../schema-builder/table/TableCheck");
@@ -18,6 +17,7 @@ var Broadcaster_1 = require("../../subscriber/Broadcaster");
 var OrmUtils_1 = require("../../util/OrmUtils");
 var Query_1 = require("../Query");
 var MssqlParameter_1 = require("./MssqlParameter");
+var BroadcasterResult_1 = require("../../subscriber/BroadcasterResult");
 /**
  * Runs queries on a single SQL Server database connection.
  */
@@ -27,7 +27,6 @@ var SqlServerQueryRunner = /** @class */ (function (_super) {
     // Constructor
     // -------------------------------------------------------------------------
     function SqlServerQueryRunner(driver, mode) {
-        if (mode === void 0) { mode = "master"; }
         var _this = _super.call(this) || this;
         // -------------------------------------------------------------------------
         // Protected Properties
@@ -69,44 +68,62 @@ var SqlServerQueryRunner = /** @class */ (function (_super) {
      */
     SqlServerQueryRunner.prototype.startTransaction = function (isolationLevel) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var beforeBroadcastResult;
             var _this = this;
             return tslib_1.__generator(this, function (_a) {
-                if (this.isReleased)
-                    throw new QueryRunnerAlreadyReleasedError_1.QueryRunnerAlreadyReleasedError();
-                if (this.isTransactionActive)
-                    throw new TransactionAlreadyStartedError_1.TransactionAlreadyStartedError();
-                return [2 /*return*/, new Promise(function (ok, fail) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                        var pool, transactionCallback;
-                        var _this = this;
-                        return tslib_1.__generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0:
-                                    this.isTransactionActive = true;
-                                    return [4 /*yield*/, (this.mode === "slave" ? this.driver.obtainSlaveConnection() : this.driver.obtainMasterConnection())];
-                                case 1:
-                                    pool = _a.sent();
-                                    this.databaseConnection = pool.transaction();
-                                    transactionCallback = function (err) {
-                                        if (err) {
-                                            _this.isTransactionActive = false;
-                                            return fail(err);
-                                        }
-                                        ok();
-                                        _this.connection.logger.logQuery("BEGIN TRANSACTION");
+                switch (_a.label) {
+                    case 0:
+                        if (this.isReleased)
+                            throw new QueryRunnerAlreadyReleasedError_1.QueryRunnerAlreadyReleasedError();
+                        if (this.isTransactionActive)
+                            throw new TransactionAlreadyStartedError_1.TransactionAlreadyStartedError();
+                        beforeBroadcastResult = new BroadcasterResult_1.BroadcasterResult();
+                        this.broadcaster.broadcastBeforeTransactionStartEvent(beforeBroadcastResult);
+                        if (!(beforeBroadcastResult.promises.length > 0)) return [3 /*break*/, 2];
+                        return [4 /*yield*/, Promise.all(beforeBroadcastResult.promises)];
+                    case 1:
+                        _a.sent();
+                        _a.label = 2;
+                    case 2: return [2 /*return*/, new Promise(function (ok, fail) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                            var pool, transactionCallback, afterBroadcastResult;
+                            var _this = this;
+                            return tslib_1.__generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        this.isTransactionActive = true;
+                                        return [4 /*yield*/, (this.mode === "slave" ? this.driver.obtainSlaveConnection() : this.driver.obtainMasterConnection())];
+                                    case 1:
+                                        pool = _a.sent();
+                                        this.databaseConnection = pool.transaction();
+                                        transactionCallback = function (err) {
+                                            if (err) {
+                                                _this.isTransactionActive = false;
+                                                return fail(err);
+                                            }
+                                            ok();
+                                            _this.connection.logger.logQuery("BEGIN TRANSACTION");
+                                            if (isolationLevel) {
+                                                _this.connection.logger.logQuery("SET TRANSACTION ISOLATION LEVEL " + isolationLevel);
+                                            }
+                                        };
                                         if (isolationLevel) {
-                                            _this.connection.logger.logQuery("SET TRANSACTION ISOLATION LEVEL " + isolationLevel);
+                                            this.databaseConnection.begin(this.convertIsolationLevel(isolationLevel), transactionCallback);
                                         }
-                                    };
-                                    if (isolationLevel) {
-                                        this.databaseConnection.begin(this.convertIsolationLevel(isolationLevel), transactionCallback);
-                                    }
-                                    else {
-                                        this.databaseConnection.begin(transactionCallback);
-                                    }
-                                    return [2 /*return*/];
-                            }
-                        });
-                    }); })];
+                                        else {
+                                            this.databaseConnection.begin(transactionCallback);
+                                        }
+                                        afterBroadcastResult = new BroadcasterResult_1.BroadcasterResult();
+                                        this.broadcaster.broadcastAfterTransactionStartEvent(afterBroadcastResult);
+                                        if (!(afterBroadcastResult.promises.length > 0)) return [3 /*break*/, 3];
+                                        return [4 /*yield*/, Promise.all(afterBroadcastResult.promises)];
+                                    case 2:
+                                        _a.sent();
+                                        _a.label = 3;
+                                    case 3: return [2 /*return*/];
+                                }
+                            });
+                        }); })];
+                }
             });
         });
     };
@@ -116,22 +133,48 @@ var SqlServerQueryRunner = /** @class */ (function (_super) {
      */
     SqlServerQueryRunner.prototype.commitTransaction = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var beforeBroadcastResult;
             var _this = this;
             return tslib_1.__generator(this, function (_a) {
-                if (this.isReleased)
-                    throw new QueryRunnerAlreadyReleasedError_1.QueryRunnerAlreadyReleasedError();
-                if (!this.isTransactionActive)
-                    throw new TransactionNotStartedError_1.TransactionNotStartedError();
-                return [2 /*return*/, new Promise(function (ok, fail) {
-                        _this.databaseConnection.commit(function (err) {
-                            if (err)
-                                return fail(err);
-                            _this.isTransactionActive = false;
-                            _this.databaseConnection = null;
-                            ok();
-                            _this.connection.logger.logQuery("COMMIT");
-                        });
-                    })];
+                switch (_a.label) {
+                    case 0:
+                        if (this.isReleased)
+                            throw new QueryRunnerAlreadyReleasedError_1.QueryRunnerAlreadyReleasedError();
+                        if (!this.isTransactionActive)
+                            throw new TransactionNotStartedError_1.TransactionNotStartedError();
+                        beforeBroadcastResult = new BroadcasterResult_1.BroadcasterResult();
+                        this.broadcaster.broadcastBeforeTransactionCommitEvent(beforeBroadcastResult);
+                        if (!(beforeBroadcastResult.promises.length > 0)) return [3 /*break*/, 2];
+                        return [4 /*yield*/, Promise.all(beforeBroadcastResult.promises)];
+                    case 1:
+                        _a.sent();
+                        _a.label = 2;
+                    case 2: return [2 /*return*/, new Promise(function (ok, fail) {
+                            _this.databaseConnection.commit(function (err) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                                var afterBroadcastResult;
+                                return tslib_1.__generator(this, function (_a) {
+                                    switch (_a.label) {
+                                        case 0:
+                                            if (err)
+                                                return [2 /*return*/, fail(err)];
+                                            this.isTransactionActive = false;
+                                            this.databaseConnection = null;
+                                            afterBroadcastResult = new BroadcasterResult_1.BroadcasterResult();
+                                            this.broadcaster.broadcastAfterTransactionCommitEvent(afterBroadcastResult);
+                                            if (!(afterBroadcastResult.promises.length > 0)) return [3 /*break*/, 2];
+                                            return [4 /*yield*/, Promise.all(afterBroadcastResult.promises)];
+                                        case 1:
+                                            _a.sent();
+                                            _a.label = 2;
+                                        case 2:
+                                            ok();
+                                            this.connection.logger.logQuery("COMMIT");
+                                            return [2 /*return*/];
+                                    }
+                                });
+                            }); });
+                        })];
+                }
             });
         });
     };
@@ -141,22 +184,48 @@ var SqlServerQueryRunner = /** @class */ (function (_super) {
      */
     SqlServerQueryRunner.prototype.rollbackTransaction = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var beforeBroadcastResult;
             var _this = this;
             return tslib_1.__generator(this, function (_a) {
-                if (this.isReleased)
-                    throw new QueryRunnerAlreadyReleasedError_1.QueryRunnerAlreadyReleasedError();
-                if (!this.isTransactionActive)
-                    throw new TransactionNotStartedError_1.TransactionNotStartedError();
-                return [2 /*return*/, new Promise(function (ok, fail) {
-                        _this.databaseConnection.rollback(function (err) {
-                            if (err)
-                                return fail(err);
-                            _this.isTransactionActive = false;
-                            _this.databaseConnection = null;
-                            ok();
-                            _this.connection.logger.logQuery("ROLLBACK");
-                        });
-                    })];
+                switch (_a.label) {
+                    case 0:
+                        if (this.isReleased)
+                            throw new QueryRunnerAlreadyReleasedError_1.QueryRunnerAlreadyReleasedError();
+                        if (!this.isTransactionActive)
+                            throw new TransactionNotStartedError_1.TransactionNotStartedError();
+                        beforeBroadcastResult = new BroadcasterResult_1.BroadcasterResult();
+                        this.broadcaster.broadcastBeforeTransactionRollbackEvent(beforeBroadcastResult);
+                        if (!(beforeBroadcastResult.promises.length > 0)) return [3 /*break*/, 2];
+                        return [4 /*yield*/, Promise.all(beforeBroadcastResult.promises)];
+                    case 1:
+                        _a.sent();
+                        _a.label = 2;
+                    case 2: return [2 /*return*/, new Promise(function (ok, fail) {
+                            _this.databaseConnection.rollback(function (err) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                                var afterBroadcastResult;
+                                return tslib_1.__generator(this, function (_a) {
+                                    switch (_a.label) {
+                                        case 0:
+                                            if (err)
+                                                return [2 /*return*/, fail(err)];
+                                            this.isTransactionActive = false;
+                                            this.databaseConnection = null;
+                                            afterBroadcastResult = new BroadcasterResult_1.BroadcasterResult();
+                                            this.broadcaster.broadcastAfterTransactionRollbackEvent(afterBroadcastResult);
+                                            if (!(afterBroadcastResult.promises.length > 0)) return [3 /*break*/, 2];
+                                            return [4 /*yield*/, Promise.all(afterBroadcastResult.promises)];
+                                        case 1:
+                                            _a.sent();
+                                            _a.label = 2;
+                                        case 2:
+                                            ok();
+                                            this.connection.logger.logQuery("ROLLBACK");
+                                            return [2 /*return*/];
+                                    }
+                                });
+                            }); });
+                        })];
+                }
             });
         });
     };
@@ -436,7 +505,7 @@ var SqlServerQueryRunner = /** @class */ (function (_super) {
                     case 0:
                         parsedTableName = this.parseTableName(tableOrName);
                         schema = parsedTableName.schema === "SCHEMA_NAME()" ? parsedTableName.schema : "'" + parsedTableName.schema + "'";
-                        sql = "SELECT * FROM \"" + parsedTableName.database + "\".\"INFORMATION_SCHEMA\".\"TABLES\" WHERE \"TABLE_NAME\" = '" + parsedTableName.name + "' AND \"COLUMN_NAME\" = '" + columnName + "' AND \"TABLE_SCHEMA\" = " + schema;
+                        sql = "SELECT * FROM \"" + parsedTableName.database + "\".\"INFORMATION_SCHEMA\".\"COLUMNS\" WHERE \"TABLE_NAME\" = '" + parsedTableName.name + "' AND \"COLUMN_NAME\" = '" + columnName + "' AND \"TABLE_SCHEMA\" = " + schema;
                         return [4 /*yield*/, this.query(sql)];
                     case 1:
                         result = _a.sent();
@@ -899,13 +968,36 @@ var SqlServerQueryRunner = /** @class */ (function (_super) {
      */
     SqlServerQueryRunner.prototype.addColumns = function (tableOrName, columns) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _this = this;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, index_1.PromiseUtils.runInSequence(columns, function (column) { return _this.addColumn(tableOrName, column); })];
+            var columns_1, columns_1_1, column, e_1_1;
+            var e_1, _a;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _b.trys.push([0, 5, 6, 7]);
+                        columns_1 = tslib_1.__values(columns), columns_1_1 = columns_1.next();
+                        _b.label = 1;
                     case 1:
-                        _a.sent();
-                        return [2 /*return*/];
+                        if (!!columns_1_1.done) return [3 /*break*/, 4];
+                        column = columns_1_1.value;
+                        return [4 /*yield*/, this.addColumn(tableOrName, column)];
+                    case 2:
+                        _b.sent();
+                        _b.label = 3;
+                    case 3:
+                        columns_1_1 = columns_1.next();
+                        return [3 /*break*/, 1];
+                    case 4: return [3 /*break*/, 7];
+                    case 5:
+                        e_1_1 = _b.sent();
+                        e_1 = { error: e_1_1 };
+                        return [3 /*break*/, 7];
+                    case 6:
+                        try {
+                            if (columns_1_1 && !columns_1_1.done && (_a = columns_1.return)) _a.call(columns_1);
+                        }
+                        finally { if (e_1) throw e_1.error; }
+                        return [7 /*endfinally*/];
+                    case 7: return [2 /*return*/];
                 }
             });
         });
@@ -1173,13 +1265,36 @@ var SqlServerQueryRunner = /** @class */ (function (_super) {
      */
     SqlServerQueryRunner.prototype.changeColumns = function (tableOrName, changedColumns) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _this = this;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, index_1.PromiseUtils.runInSequence(changedColumns, function (changedColumn) { return _this.changeColumn(tableOrName, changedColumn.oldColumn, changedColumn.newColumn); })];
+            var changedColumns_1, changedColumns_1_1, _a, oldColumn, newColumn, e_2_1;
+            var e_2, _b;
+            return tslib_1.__generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        _c.trys.push([0, 5, 6, 7]);
+                        changedColumns_1 = tslib_1.__values(changedColumns), changedColumns_1_1 = changedColumns_1.next();
+                        _c.label = 1;
                     case 1:
-                        _a.sent();
-                        return [2 /*return*/];
+                        if (!!changedColumns_1_1.done) return [3 /*break*/, 4];
+                        _a = changedColumns_1_1.value, oldColumn = _a.oldColumn, newColumn = _a.newColumn;
+                        return [4 /*yield*/, this.changeColumn(tableOrName, oldColumn, newColumn)];
+                    case 2:
+                        _c.sent();
+                        _c.label = 3;
+                    case 3:
+                        changedColumns_1_1 = changedColumns_1.next();
+                        return [3 /*break*/, 1];
+                    case 4: return [3 /*break*/, 7];
+                    case 5:
+                        e_2_1 = _c.sent();
+                        e_2 = { error: e_2_1 };
+                        return [3 /*break*/, 7];
+                    case 6:
+                        try {
+                            if (changedColumns_1_1 && !changedColumns_1_1.done && (_b = changedColumns_1.return)) _b.call(changedColumns_1);
+                        }
+                        finally { if (e_2) throw e_2.error; }
+                        return [7 /*endfinally*/];
+                    case 7: return [2 /*return*/];
                 }
             });
         });
@@ -1265,13 +1380,36 @@ var SqlServerQueryRunner = /** @class */ (function (_super) {
      */
     SqlServerQueryRunner.prototype.dropColumns = function (tableOrName, columns) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _this = this;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, index_1.PromiseUtils.runInSequence(columns, function (column) { return _this.dropColumn(tableOrName, column); })];
+            var columns_2, columns_2_1, column, e_3_1;
+            var e_3, _a;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _b.trys.push([0, 5, 6, 7]);
+                        columns_2 = tslib_1.__values(columns), columns_2_1 = columns_2.next();
+                        _b.label = 1;
                     case 1:
-                        _a.sent();
-                        return [2 /*return*/];
+                        if (!!columns_2_1.done) return [3 /*break*/, 4];
+                        column = columns_2_1.value;
+                        return [4 /*yield*/, this.dropColumn(tableOrName, column)];
+                    case 2:
+                        _b.sent();
+                        _b.label = 3;
+                    case 3:
+                        columns_2_1 = columns_2.next();
+                        return [3 /*break*/, 1];
+                    case 4: return [3 /*break*/, 7];
+                    case 5:
+                        e_3_1 = _b.sent();
+                        e_3 = { error: e_3_1 };
+                        return [3 /*break*/, 7];
+                    case 6:
+                        try {
+                            if (columns_2_1 && !columns_2_1.done && (_a = columns_2.return)) _a.call(columns_2);
+                        }
+                        finally { if (e_3) throw e_3.error; }
+                        return [7 /*endfinally*/];
+                    case 7: return [2 /*return*/];
                 }
             });
         });
@@ -2178,7 +2316,7 @@ var SqlServerQueryRunner = /** @class */ (function (_super) {
                                     table.columns = dbColumns
                                         .filter(function (dbColumn) { return _this.driver.buildTableName(dbColumn["TABLE_NAME"], dbColumn["TABLE_SCHEMA"], dbColumn["TABLE_CATALOG"]) === tableFullName; })
                                         .map(function (dbColumn) {
-                                        var e_1, _a;
+                                        var e_4, _a;
                                         var columnConstraints = dbConstraints.filter(function (dbConstraint) {
                                             return _this.driver.buildTableName(dbConstraint["TABLE_NAME"], dbConstraint["CONSTRAINT_SCHEMA"], dbConstraint["CONSTRAINT_CATALOG"]) === tableFullName
                                                 && dbConstraint["COLUMN_NAME"] === dbColumn["COLUMN_NAME"];
@@ -2235,12 +2373,12 @@ var SqlServerQueryRunner = /** @class */ (function (_super) {
                                                         }
                                                     }
                                                 }
-                                                catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                                                catch (e_4_1) { e_4 = { error: e_4_1 }; }
                                                 finally {
                                                     try {
                                                         if (columnCheckConstraints_1_1 && !columnCheckConstraints_1_1.done && (_a = columnCheckConstraints_1.return)) _a.call(columnCheckConstraints_1);
                                                     }
-                                                    finally { if (e_1) throw e_1.error; }
+                                                    finally { if (e_4) throw e_4.error; }
                                                 }
                                             }
                                         }