typeorm 0.2.28 → 0.2.32

package/browser/driver/sqlserver/SqlServerQueryRunner.js

@@ -1,4 +1,4 @@
-import { __awaiter, __extends, __generator, __read, __spread, __values } from "tslib";
+import { __awaiter, __extends, __generator, __read, __spreadArray, __values } from "tslib";
 import { QueryFailedError } from "../../error/QueryFailedError";
 import { QueryRunnerAlreadyReleasedError } from "../../error/QueryRunnerAlreadyReleasedError";
 import { TransactionAlreadyStartedError } from "../../error/TransactionAlreadyStartedError";
@@ -15,6 +15,7 @@ import { Broadcaster } from "../../subscriber/Broadcaster";
 import { OrmUtils } from "../../util/OrmUtils";
 import { Query } from "../Query";
 import { MssqlParameter } from "./MssqlParameter";
+import { BroadcasterResult } from "../../subscriber/BroadcasterResult";
 /**
  * Runs queries on a single SQL Server database connection.
  */
@@ -65,44 +66,62 @@ var SqlServerQueryRunner = /** @class */ (function (_super) {
      */
     SqlServerQueryRunner.prototype.startTransaction = function (isolationLevel) {
         return __awaiter(this, void 0, void 0, function () {
+            var beforeBroadcastResult;
             var _this = this;
             return __generator(this, function (_a) {
-                if (this.isReleased)
-                    throw new QueryRunnerAlreadyReleasedError();
-                if (this.isTransactionActive)
-                    throw new TransactionAlreadyStartedError();
-                return [2 /*return*/, new Promise(function (ok, fail) { return __awaiter(_this, void 0, void 0, function () {
-                        var pool, transactionCallback;
-                        var _this = this;
-                        return __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();
+                        if (this.isTransactionActive)
+                            throw new TransactionAlreadyStartedError();
+                        beforeBroadcastResult = new 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 __awaiter(_this, void 0, void 0, function () {
+                            var pool, transactionCallback, afterBroadcastResult;
+                            var _this = this;
+                            return __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();
+                                        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*/];
+                                }
+                            });
+                        }); })];
+                }
             });
         });
     };
@@ -112,22 +131,48 @@ var SqlServerQueryRunner = /** @class */ (function (_super) {
      */
     SqlServerQueryRunner.prototype.commitTransaction = function () {
         return __awaiter(this, void 0, void 0, function () {
+            var beforeBroadcastResult;
             var _this = this;
             return __generator(this, function (_a) {
-                if (this.isReleased)
-                    throw new QueryRunnerAlreadyReleasedError();
-                if (!this.isTransactionActive)
-                    throw new 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();
+                        if (!this.isTransactionActive)
+                            throw new TransactionNotStartedError();
+                        beforeBroadcastResult = new 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 __awaiter(_this, void 0, void 0, function () {
+                                var afterBroadcastResult;
+                                return __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();
+                                            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*/];
+                                    }
+                                });
+                            }); });
+                        })];
+                }
             });
         });
     };
@@ -137,22 +182,48 @@ var SqlServerQueryRunner = /** @class */ (function (_super) {
      */
     SqlServerQueryRunner.prototype.rollbackTransaction = function () {
         return __awaiter(this, void 0, void 0, function () {
+            var beforeBroadcastResult;
             var _this = this;
             return __generator(this, function (_a) {
-                if (this.isReleased)
-                    throw new QueryRunnerAlreadyReleasedError();
-                if (!this.isTransactionActive)
-                    throw new 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();
+                        if (!this.isTransactionActive)
+                            throw new TransactionNotStartedError();
+                        beforeBroadcastResult = new 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 __awaiter(_this, void 0, void 0, function () {
+                                var afterBroadcastResult;
+                                return __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();
+                                            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*/];
+                                    }
+                                });
+                            }); });
+                        })];
+                }
             });
         });
     };
@@ -170,7 +241,7 @@ var SqlServerQueryRunner = /** @class */ (function (_super) {
                             throw new QueryRunnerAlreadyReleasedError();
                         waitingPromise = new Promise(function (ok) { return waitingOkay = ok; });
                         if (!this.queryResponsibilityChain.length) return [3 /*break*/, 2];
-                        otherWaitingPromises = __spread(this.queryResponsibilityChain);
+                        otherWaitingPromises = __spreadArray([], __read(this.queryResponsibilityChain));
                         this.queryResponsibilityChain.push(waitingPromise);
                         return [4 /*yield*/, Promise.all(otherWaitingPromises)];
                     case 1:
@@ -191,17 +262,18 @@ var SqlServerQueryRunner = /** @class */ (function (_super) {
                                         request_1 = new this.driver.mssql.Request(this.isTransactionActive ? this.databaseConnection : pool);
                                         if (parameters && parameters.length) {
                                             parameters.forEach(function (parameter, index) {
+                                                var parameterName = index.toString();
                                                 if (parameter instanceof MssqlParameter) {
                                                     var mssqlParameter = _this.mssqlParameterToNativeParameter(parameter);
                                                     if (mssqlParameter) {
-                                                        request_1.input(index, mssqlParameter, parameter.value);
+                                                        request_1.input(parameterName, mssqlParameter, parameter.value);
                                                     }
                                                     else {
-                                                        request_1.input(index, parameter.value);
+                                                        request_1.input(parameterName, parameter.value);
                                                     }
                                                 }
                                                 else {
-                                                    request_1.input(index, parameter);
+                                                    request_1.input(parameterName, parameter);
                                                 }
                                             });
                                         }
@@ -269,7 +341,7 @@ var SqlServerQueryRunner = /** @class */ (function (_super) {
                             throw new QueryRunnerAlreadyReleasedError();
                         waitingPromise = new Promise(function (ok) { return waitingOkay = ok; });
                         if (!this.queryResponsibilityChain.length) return [3 /*break*/, 2];
-                        otherWaitingPromises = __spread(this.queryResponsibilityChain);
+                        otherWaitingPromises = __spreadArray([], __read(this.queryResponsibilityChain));
                         this.queryResponsibilityChain.push(waitingPromise);
                         return [4 /*yield*/, Promise.all(otherWaitingPromises)];
                     case 1:
@@ -290,11 +362,12 @@ var SqlServerQueryRunner = /** @class */ (function (_super) {
                                         request.stream = true;
                                         if (parameters && parameters.length) {
                                             parameters.forEach(function (parameter, index) {
+                                                var parameterName = index.toString();
                                                 if (parameter instanceof MssqlParameter) {
-                                                    request.input(index, _this.mssqlParameterToNativeParameter(parameter), parameter.value);
+                                                    request.input(parameterName, _this.mssqlParameterToNativeParameter(parameter), parameter.value);
                                                 }
                                                 else {
-                                                    request.input(index, parameter);
+                                                    request.input(parameterName, parameter);
                                                 }
                                             });
                                         }
@@ -2282,13 +2355,12 @@ var SqlServerQueryRunner = /** @class */ (function (_super) {
                                             // Check if this is an enum
                                             var columnCheckConstraints = columnConstraints.filter(function (constraint) { return constraint["CONSTRAINT_TYPE"] === "CHECK"; });
                                             if (columnCheckConstraints.length) {
-                                                var isEnumRegexp = new RegExp("^\\(\\[" + tableColumn.name + "\\]='[^']+'(?: OR \\[" + tableColumn.name + "\\]='[^']+')*\\)$");
                                                 try {
+                                                    // const isEnumRegexp = new RegExp("^\\(\\[" + tableColumn.name + "\\]='[^']+'(?: OR \\[" + tableColumn.name + "\\]='[^']+')*\\)$");
                                                     for (var columnCheckConstraints_1 = __values(columnCheckConstraints), columnCheckConstraints_1_1 = columnCheckConstraints_1.next(); !columnCheckConstraints_1_1.done; columnCheckConstraints_1_1 = columnCheckConstraints_1.next()) {
                                                         var checkConstraint = columnCheckConstraints_1_1.value;
-                                                        if (isEnumRegexp.test(checkConstraint["definition"])) {
+                                                        if (_this.isEnumCheckConstraint(checkConstraint["CONSTRAINT_NAME"])) {
                                                             // This is an enum constraint, make column into an enum
-                                                            tableColumn.type = "simple-enum";
                                                             tableColumn.enum = [];
                                                             var enumValueRegexp = new RegExp("\\[" + tableColumn.name + "\\]='([^']+)'", "g");
                                                             var result = void 0;
@@ -2347,7 +2419,9 @@ var SqlServerQueryRunner = /** @class */ (function (_super) {
                                         return _this.driver.buildTableName(dbConstraint["TABLE_NAME"], dbConstraint["CONSTRAINT_SCHEMA"], dbConstraint["CONSTRAINT_CATALOG"]) === tableFullName
                                             && dbConstraint["CONSTRAINT_TYPE"] === "CHECK";
                                     }), function (dbConstraint) { return dbConstraint["CONSTRAINT_NAME"]; });
-                                    table.checks = tableCheckConstraints.map(function (constraint) {
+                                    table.checks = tableCheckConstraints
+                                        .filter(function (constraint) { return !_this.isEnumCheckConstraint(constraint["CONSTRAINT_NAME"]); })
+                                        .map(function (constraint) {
                                         var checks = dbConstraints.filter(function (dbC) { return dbC["CONSTRAINT_NAME"] === constraint["CONSTRAINT_NAME"]; });
                                         return new TableCheck({
                                             name: constraint["CONSTRAINT_NAME"],
@@ -2678,8 +2752,11 @@ var SqlServerQueryRunner = /** @class */ (function (_super) {
      */
     SqlServerQueryRunner.prototype.buildCreateColumnSql = function (table, column, skipIdentity, createDefault) {
         var c = "\"" + column.name + "\" " + this.connection.driver.createFullType(column);
-        if (column.enum)
-            c += " CHECK( " + column.name + " IN (" + column.enum.map(function (val) { return "'" + val + "'"; }).join(",") + ") )";
+        if (column.enum) {
+            var expression = column.name + " IN (" + column.enum.map(function (val) { return "'" + val + "'"; }).join(",") + ")";
+            var checkName = this.connection.namingStrategy.checkConstraintName(table, expression, true);
+            c += " CONSTRAINT " + checkName + " CHECK(" + expression + ")";
+        }
         if (column.collation)
             c += " COLLATE " + column.collation;
         if (column.isNullable !== true)
@@ -2698,6 +2775,9 @@ var SqlServerQueryRunner = /** @class */ (function (_super) {
         }
         return c;
     };
+    SqlServerQueryRunner.prototype.isEnumCheckConstraint = function (name) {
+        return name.indexOf("CHK_") !== -1 && name.indexOf("_ENUM") !== -1;
+    };
     /**
      * Converts MssqlParameter into real mssql parameter type.
      */
@@ -2709,7 +2789,7 @@ var SqlServerQueryRunner = /** @class */ (function (_super) {
             case "bigint":
                 return this.driver.mssql.BigInt;
             case "decimal":
-                return (_a = this.driver.mssql).Decimal.apply(_a, __spread(parameter.params));
+                return (_a = this.driver.mssql).Decimal.apply(_a, __spreadArray([], __read(parameter.params)));
             case "float":
                 return this.driver.mssql.Float;
             case "int":
@@ -2717,7 +2797,7 @@ var SqlServerQueryRunner = /** @class */ (function (_super) {
             case "money":
                 return this.driver.mssql.Money;
             case "numeric":
-                return (_b = this.driver.mssql).Numeric.apply(_b, __spread(parameter.params));
+                return (_b = this.driver.mssql).Numeric.apply(_b, __spreadArray([], __read(parameter.params)));
             case "smallint":
                 return this.driver.mssql.SmallInt;
             case "smallmoney":
@@ -2727,29 +2807,29 @@ var SqlServerQueryRunner = /** @class */ (function (_super) {
             case "tinyint":
                 return this.driver.mssql.TinyInt;
             case "char":
-                return (_c = this.driver.mssql).Char.apply(_c, __spread(parameter.params));
+                return (_c = this.driver.mssql).Char.apply(_c, __spreadArray([], __read(parameter.params)));
             case "nchar":
-                return (_d = this.driver.mssql).NChar.apply(_d, __spread(parameter.params));
+                return (_d = this.driver.mssql).NChar.apply(_d, __spreadArray([], __read(parameter.params)));
             case "text":
                 return this.driver.mssql.Text;
             case "ntext":
                 return this.driver.mssql.Ntext;
             case "varchar":
-                return (_e = this.driver.mssql).VarChar.apply(_e, __spread(parameter.params));
+                return (_e = this.driver.mssql).VarChar.apply(_e, __spreadArray([], __read(parameter.params)));
             case "nvarchar":
-                return (_f = this.driver.mssql).NVarChar.apply(_f, __spread(parameter.params));
+                return (_f = this.driver.mssql).NVarChar.apply(_f, __spreadArray([], __read(parameter.params)));
             case "xml":
                 return this.driver.mssql.Xml;
             case "time":
-                return (_g = this.driver.mssql).Time.apply(_g, __spread(parameter.params));
+                return (_g = this.driver.mssql).Time.apply(_g, __spreadArray([], __read(parameter.params)));
             case "date":
                 return this.driver.mssql.Date;
             case "datetime":
                 return this.driver.mssql.DateTime;
             case "datetime2":
-                return (_h = this.driver.mssql).DateTime2.apply(_h, __spread(parameter.params));
+                return (_h = this.driver.mssql).DateTime2.apply(_h, __spreadArray([], __read(parameter.params)));
             case "datetimeoffset":
-                return (_j = this.driver.mssql).DateTimeOffset.apply(_j, __spread(parameter.params));
+                return (_j = this.driver.mssql).DateTimeOffset.apply(_j, __spreadArray([], __read(parameter.params)));
             case "smalldatetime":
                 return this.driver.mssql.SmallDateTime;
             case "uniqueidentifier":
@@ -2759,7 +2839,7 @@ var SqlServerQueryRunner = /** @class */ (function (_super) {
             case "binary":
                 return this.driver.mssql.Binary;
             case "varbinary":
-                return (_k = this.driver.mssql).VarBinary.apply(_k, __spread(parameter.params));
+                return (_k = this.driver.mssql).VarBinary.apply(_k, __spreadArray([], __read(parameter.params)));
             case "image":
                 return this.driver.mssql.Image;
             case "udt":