typeorm 0.2.27 → 0.2.31

package/browser/driver/cockroachdb/CockroachQueryRunner.js

@@ -15,6 +15,7 @@ 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 { BroadcasterResult } from "../../subscriber/BroadcasterResult";
 /**
  * Runs queries on a single postgres database connection.
  */
@@ -90,26 +91,42 @@ var CockroachQueryRunner = /** @class */ (function (_super) {
      */
     CockroachQueryRunner.prototype.startTransaction = function (isolationLevel) {
         return __awaiter(this, void 0, void 0, function () {
+            var beforeBroadcastResult, afterBroadcastResult;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         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:
                         this.isTransactionActive = true;
                         return [4 /*yield*/, this.query("START TRANSACTION")];
-                    case 1:
+                    case 3:
                         _a.sent();
                         return [4 /*yield*/, this.query("SAVEPOINT cockroach_restart")];
-                    case 2:
+                    case 4:
                         _a.sent();
-                        if (!isolationLevel) return [3 /*break*/, 4];
+                        if (!isolationLevel) return [3 /*break*/, 6];
                         return [4 /*yield*/, this.query("SET TRANSACTION ISOLATION LEVEL " + isolationLevel)];
-                    case 3:
+                    case 5:
                         _a.sent();
-                        _a.label = 4;
-                    case 4:
+                        _a.label = 6;
+                    case 6:
                         this.storeQueries = true;
-                        return [2 /*return*/];
+                        afterBroadcastResult = new BroadcasterResult();
+                        this.broadcaster.broadcastAfterTransactionStartEvent(afterBroadcastResult);
+                        if (!(afterBroadcastResult.promises.length > 0)) return [3 /*break*/, 8];
+                        return [4 /*yield*/, Promise.all(afterBroadcastResult.promises)];
+                    case 7:
+                        _a.sent();
+                        _a.label = 8;
+                    case 8: return [2 /*return*/];
                 }
             });
         });
@@ -120,64 +137,80 @@ var CockroachQueryRunner = /** @class */ (function (_super) {
      */
     CockroachQueryRunner.prototype.commitTransaction = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var e_1, _a, _b, q, e_2_1;
+            var beforeBroadcastResult, e_1, _a, _b, q, e_2_1, afterBroadcastResult;
             var e_2, _c;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
                         if (!this.isTransactionActive)
                             throw new TransactionNotStartedError();
-                        this.storeQueries = false;
-                        _d.label = 1;
+                        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:
-                        _d.trys.push([1, 4, , 16]);
-                        return [4 /*yield*/, this.query("RELEASE SAVEPOINT cockroach_restart")];
+                        _d.sent();
+                        _d.label = 2;
                     case 2:
+                        this.storeQueries = false;
+                        _d.label = 3;
+                    case 3:
+                        _d.trys.push([3, 6, , 18]);
+                        return [4 /*yield*/, this.query("RELEASE SAVEPOINT cockroach_restart")];
+                    case 4:
                         _d.sent();
                         return [4 /*yield*/, this.query("COMMIT")];
-                    case 3:
+                    case 5:
                         _d.sent();
                         this.queries = [];
                         this.isTransactionActive = false;
-                        return [3 /*break*/, 16];
-                    case 4:
+                        return [3 /*break*/, 18];
+                    case 6:
                         e_1 = _d.sent();
-                        if (!(e_1.code === "40001")) return [3 /*break*/, 15];
+                        if (!(e_1.code === "40001")) return [3 /*break*/, 17];
                         return [4 /*yield*/, this.query("ROLLBACK TO SAVEPOINT cockroach_restart")];
-                    case 5:
+                    case 7:
                         _d.sent();
-                        _d.label = 6;
-                    case 6:
-                        _d.trys.push([6, 11, 12, 13]);
+                        _d.label = 8;
+                    case 8:
+                        _d.trys.push([8, 13, 14, 15]);
                         _a = __values(this.queries), _b = _a.next();
-                        _d.label = 7;
-                    case 7:
-                        if (!!_b.done) return [3 /*break*/, 10];
+                        _d.label = 9;
+                    case 9:
+                        if (!!_b.done) return [3 /*break*/, 12];
                         q = _b.value;
                         return [4 /*yield*/, this.query(q.query, q.parameters)];
-                    case 8:
+                    case 10:
                         _d.sent();
-                        _d.label = 9;
-                    case 9:
-                        _b = _a.next();
-                        return [3 /*break*/, 7];
-                    case 10: return [3 /*break*/, 13];
+                        _d.label = 11;
                     case 11:
+                        _b = _a.next();
+                        return [3 /*break*/, 9];
+                    case 12: return [3 /*break*/, 15];
+                    case 13:
                         e_2_1 = _d.sent();
                         e_2 = { error: e_2_1 };
-                        return [3 /*break*/, 13];
-                    case 12:
+                        return [3 /*break*/, 15];
+                    case 14:
                         try {
                             if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
                         finally { if (e_2) throw e_2.error; }
                         return [7 /*endfinally*/];
-                    case 13: return [4 /*yield*/, this.commitTransaction()];
-                    case 14:
+                    case 15: return [4 /*yield*/, this.commitTransaction()];
+                    case 16:
+                        _d.sent();
+                        _d.label = 17;
+                    case 17: return [3 /*break*/, 18];
+                    case 18:
+                        afterBroadcastResult = new BroadcasterResult();
+                        this.broadcaster.broadcastAfterTransactionCommitEvent(afterBroadcastResult);
+                        if (!(afterBroadcastResult.promises.length > 0)) return [3 /*break*/, 20];
+                        return [4 /*yield*/, Promise.all(afterBroadcastResult.promises)];
+                    case 19:
                         _d.sent();
-                        _d.label = 15;
-                    case 15: return [3 /*break*/, 16];
-                    case 16: return [2 /*return*/];
+                        _d.label = 20;
+                    case 20: return [2 /*return*/];
                 }
             });
         });
@@ -188,18 +221,34 @@ var CockroachQueryRunner = /** @class */ (function (_super) {
      */
     CockroachQueryRunner.prototype.rollbackTransaction = function () {
         return __awaiter(this, void 0, void 0, function () {
+            var beforeBroadcastResult, afterBroadcastResult;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         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:
                         this.storeQueries = false;
                         return [4 /*yield*/, this.query("ROLLBACK")];
-                    case 1:
+                    case 3:
                         _a.sent();
                         this.queries = [];
                         this.isTransactionActive = false;
-                        return [2 /*return*/];
+                        afterBroadcastResult = new 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*/];
                 }
             });
         });
@@ -774,6 +823,11 @@ var CockroachQueryRunner = /** @class */ (function (_super) {
                             upQueries.push(this.createUniqueConstraintSql(table, uniqueConstraint));
                             downQueries.push(this.dropIndexSql(table, uniqueConstraint.name)); // CockroachDB creates indices for unique constraints
                         }
+                        // create column's comment
+                        if (column.comment) {
+                            upQueries.push(new Query("COMMENT ON COLUMN " + this.escapePath(table) + ".\"" + column.name + "\" IS " + this.escapeComment(column.comment)));
+                            downQueries.push(new Query("COMMENT ON COLUMN " + this.escapePath(table) + ".\"" + column.name + "\" IS " + this.escapeComment(column.comment)));
+                        }
                         return [4 /*yield*/, this.executeQueries(upQueries, downQueries)];
                     case 4:
                         _b.sent();
@@ -970,8 +1024,8 @@ var CockroachQueryRunner = /** @class */ (function (_super) {
                             }
                         }
                         if (oldColumn.comment !== newColumn.comment) {
-                            upQueries.push(new Query("COMMENT ON COLUMN " + this.escapePath(table) + ".\"" + oldColumn.name + "\" IS '" + newColumn.comment + "'"));
-                            downQueries.push(new Query("COMMENT ON COLUMN " + this.escapePath(table) + ".\"" + newColumn.name + "\" IS '" + oldColumn.comment + "'"));
+                            upQueries.push(new Query("COMMENT ON COLUMN " + this.escapePath(table) + ".\"" + oldColumn.name + "\" IS " + this.escapeComment(newColumn.comment)));
+                            downQueries.push(new Query("COMMENT ON COLUMN " + this.escapePath(table) + ".\"" + newColumn.name + "\" IS " + this.escapeComment(oldColumn.comment)));
                         }
                         if (newColumn.isPrimary !== oldColumn.isPrimary) {
                             primaryColumns = clonedTable.primaryColumns;
@@ -2071,7 +2125,7 @@ var CockroachQueryRunner = /** @class */ (function (_super) {
                             return "(\"table_schema\" = '" + schema + "' AND \"table_name\" = '" + name + "')";
                         }).join(" OR ");
                         tablesSql = "SELECT * FROM \"information_schema\".\"tables\" WHERE " + tablesCondition;
-                        columnsSql = "SELECT * FROM \"information_schema\".\"columns\" WHERE \"is_hidden\" = 'NO' AND " + tablesCondition;
+                        columnsSql = "\n            SELECT\n                *,\n                pg_catalog.col_description(('\"' || table_catalog || '\".\"' || table_schema || '\".\"' || table_name || '\"')::regclass::oid, ordinal_position) as description\n            FROM \"information_schema\".\"columns\"\n            WHERE \"is_hidden\" = 'NO' AND " + tablesCondition;
                         constraintsCondition = tableNames.map(function (tableName) {
                             var _a = __read(tableName.split("."), 2), schema = _a[0], name = _a[1];
                             if (!name) {
@@ -2213,9 +2267,10 @@ var CockroachQueryRunner = /** @class */ (function (_super) {
                                                             }
                                                             else {
                                                                 tableColumn.default = dbColumn["column_default"].replace(/:::.*/, "");
+                                                                tableColumn.default = tableColumn.default.replace(/^(-?[\d\.]+)$/, "($1)");
                                                             }
                                                         }
-                                                        tableColumn.comment = ""; // dbColumn["COLUMN_COMMENT"];
+                                                        tableColumn.comment = dbColumn["description"] == null ? undefined : dbColumn["description"];
                                                         if (dbColumn["character_set_name"])
                                                             tableColumn.charset = dbColumn["character_set_name"];
                                                         return [2 /*return*/, tableColumn];
@@ -2359,6 +2414,9 @@ var CockroachQueryRunner = /** @class */ (function (_super) {
             sql += ", CONSTRAINT \"" + primaryKeyName + "\" PRIMARY KEY (" + columnNames + ")";
         }
         sql += ")";
+        table.columns
+            .filter(function (it) { return it.comment; })
+            .forEach(function (it) { return sql += "; COMMENT ON COLUMN " + _this.escapePath(table) + ".\"" + it.name + "\" IS " + _this.escapeComment(it.comment); });
         return new Query(sql);
     };
     /**
@@ -2533,6 +2591,18 @@ var CockroachQueryRunner = /** @class */ (function (_super) {
         var columnName = columnOrName instanceof TableColumn ? columnOrName.name : columnOrName;
         return disableEscape ? table.name + "_" + columnName + "_seq" : "\"" + table.name + "_" + columnName + "_seq\"";
     };
+    /**
+     * Escapes a given comment so it's safe to include in a query.
+     */
+    CockroachQueryRunner.prototype.escapeComment = function (comment) {
+        if (comment === undefined || comment.length === 0) {
+            return 'NULL';
+        }
+        comment = comment
+            .replace("'", "''")
+            .replace("\0", ""); // Null bytes aren't allowed in comments
+        return "'" + comment + "'";
+    };
     /**
      * Escapes given table or view path.
      */