typeorm 0.2.25 → 0.2.29

package/driver/sqlite-abstract/AbstractSqliteQueryRunner.js

@@ -9,6 +9,7 @@ var Table_1 = require("../../schema-builder/table/Table");
 var TableIndex_1 = require("../../schema-builder/table/TableIndex");
 var TableForeignKey_1 = require("../../schema-builder/table/TableForeignKey");
 var View_1 = require("../../schema-builder/view/View");
+var BroadcasterResult_1 = require("../../subscriber/BroadcasterResult");
 var Query_1 = require("../Query");
 var TableUnique_1 = require("../../schema-builder/table/TableUnique");
 var BaseQueryRunner_1 = require("../../query-runner/BaseQueryRunner");
@@ -49,12 +50,12 @@ var AbstractSqliteQueryRunner = /** @class */ (function (_super) {
      */
     AbstractSqliteQueryRunner.prototype.startTransaction = function (isolationLevel) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var beforeBroadcastResult, afterBroadcastResult;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         if (this.isTransactionActive)
                             throw new TransactionAlreadyStartedError_1.TransactionAlreadyStartedError();
-                        this.isTransactionActive = true;
                         if (!isolationLevel) return [3 /*break*/, 4];
                         if (isolationLevel !== "READ UNCOMMITTED" && isolationLevel !== "SERIALIZABLE") {
                             throw new Error("SQLite only supports SERIALIZABLE and READ UNCOMMITTED isolation");
@@ -68,10 +69,27 @@ var AbstractSqliteQueryRunner = /** @class */ (function (_super) {
                     case 3:
                         _a.sent();
                         _a.label = 4;
-                    case 4: return [4 /*yield*/, this.query("BEGIN TRANSACTION")];
+                    case 4:
+                        beforeBroadcastResult = new BroadcasterResult_1.BroadcasterResult();
+                        this.broadcaster.broadcastBeforeTransactionStartEvent(beforeBroadcastResult);
+                        if (!(beforeBroadcastResult.promises.length > 0)) return [3 /*break*/, 6];
+                        return [4 /*yield*/, Promise.all(beforeBroadcastResult.promises)];
                     case 5:
                         _a.sent();
-                        return [2 /*return*/];
+                        _a.label = 6;
+                    case 6:
+                        this.isTransactionActive = true;
+                        return [4 /*yield*/, this.query("BEGIN TRANSACTION")];
+                    case 7:
+                        _a.sent();
+                        afterBroadcastResult = new BroadcasterResult_1.BroadcasterResult();
+                        this.broadcaster.broadcastAfterTransactionStartEvent(afterBroadcastResult);
+                        if (!(afterBroadcastResult.promises.length > 0)) return [3 /*break*/, 9];
+                        return [4 /*yield*/, Promise.all(afterBroadcastResult.promises)];
+                    case 8:
+                        _a.sent();
+                        _a.label = 9;
+                    case 9: return [2 /*return*/];
                 }
             });
         });
@@ -82,16 +100,31 @@ var AbstractSqliteQueryRunner = /** @class */ (function (_super) {
      */
     AbstractSqliteQueryRunner.prototype.commitTransaction = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var beforeBroadcastResult, afterBroadcastResult;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         if (!this.isTransactionActive)
                             throw new TransactionNotStartedError_1.TransactionNotStartedError();
-                        return [4 /*yield*/, this.query("COMMIT")];
+                        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 [4 /*yield*/, this.query("COMMIT")];
+                    case 3:
                         _a.sent();
                         this.isTransactionActive = false;
-                        return [2 /*return*/];
+                        afterBroadcastResult = new BroadcasterResult_1.BroadcasterResult();
+                        this.broadcaster.broadcastAfterTransactionCommitEvent(afterBroadcastResult);
+                        if (!(afterBroadcastResult.promises.length > 0)) return [3 /*break*/, 5];
+                        return [4 /*yield*/, Promise.all(afterBroadcastResult.promises)];
+                    case 4:
+                        _a.sent();
+                        _a.label = 5;
+                    case 5: return [2 /*return*/];
                 }
             });
         });
@@ -102,16 +135,31 @@ var AbstractSqliteQueryRunner = /** @class */ (function (_super) {
      */
     AbstractSqliteQueryRunner.prototype.rollbackTransaction = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var beforeBroadcastResult, afterBroadcastResult;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         if (!this.isTransactionActive)
                             throw new TransactionNotStartedError_1.TransactionNotStartedError();
-                        return [4 /*yield*/, this.query("ROLLBACK")];
+                        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 [4 /*yield*/, this.query("ROLLBACK")];
+                    case 3:
                         _a.sent();
                         this.isTransactionActive = false;
-                        return [2 /*return*/];
+                        afterBroadcastResult = new BroadcasterResult_1.BroadcasterResult();
+                        this.broadcaster.broadcastAfterTransactionRollbackEvent(afterBroadcastResult);
+                        if (!(afterBroadcastResult.promises.length > 0)) return [3 /*break*/, 5];
+                        return [4 /*yield*/, Promise.all(afterBroadcastResult.promises)];
+                    case 4:
+                        _a.sent();
+                        _a.label = 5;
+                    case 5: return [2 /*return*/];
                 }
             });
         });
@@ -1376,17 +1424,31 @@ var AbstractSqliteQueryRunner = /** @class */ (function (_super) {
                                                         tableColumn.enum = enumMatch[2].substr(1, enumMatch[2].length - 2).split("','");
                                                     }
                                                 }
-                                                // parse datatype and attempt to retrieve length
+                                                // parse datatype and attempt to retrieve length, precision and scale
                                                 var pos = tableColumn.type.indexOf("(");
                                                 if (pos !== -1) {
-                                                    var dataType_1 = tableColumn.type.substr(0, pos);
+                                                    var fullType = tableColumn.type;
+                                                    var dataType_1 = fullType.substr(0, pos);
                                                     if (!!_this.driver.withLengthColumnTypes.find(function (col) { return col === dataType_1; })) {
-                                                        var len = parseInt(tableColumn.type.substring(pos + 1, tableColumn.type.length - 1));
+                                                        var len = parseInt(fullType.substring(pos + 1, fullType.length - 1));
                                                         if (len) {
                                                             tableColumn.length = len.toString();
                                                             tableColumn.type = dataType_1; // remove the length part from the datatype
                                                         }
                                                     }
+                                                    if (!!_this.driver.withPrecisionColumnTypes.find(function (col) { return col === dataType_1; })) {
+                                                        var re = new RegExp("^" + dataType_1 + "\\((\\d+),?\\s?(\\d+)?\\)");
+                                                        var matches = fullType.match(re);
+                                                        if (matches && matches[1]) {
+                                                            tableColumn.precision = +matches[1];
+                                                        }
+                                                        if (!!_this.driver.withScaleColumnTypes.find(function (col) { return col === dataType_1; })) {
+                                                            if (matches && matches[2]) {
+                                                                tableColumn.scale = +matches[2];
+                                                            }
+                                                        }
+                                                        tableColumn.type = dataType_1; // remove the precision/scale part from the datatype
+                                                    }
                                                 }
                                                 return tableColumn;
                                             });