typeorm 0.2.25 → 0.2.29

package/driver/cockroachdb/CockroachQueryRunner.js

@@ -15,9 +15,9 @@ var Broadcaster_1 = require("../../subscriber/Broadcaster");
 var TableUnique_1 = require("../../schema-builder/table/TableUnique");
 var BaseQueryRunner_1 = require("../../query-runner/BaseQueryRunner");
 var OrmUtils_1 = require("../../util/OrmUtils");
-var __1 = require("../../");
 var TableCheck_1 = require("../../schema-builder/table/TableCheck");
 var TableExclusion_1 = require("../../schema-builder/table/TableExclusion");
+var BroadcasterResult_1 = require("../../subscriber/BroadcasterResult");
 /**
  * Runs queries on a single postgres database connection.
  */
@@ -27,7 +27,6 @@ var CockroachQueryRunner = /** @class */ (function (_super) {
     // Constructor
     // -------------------------------------------------------------------------
     function CockroachQueryRunner(driver, mode) {
-        if (mode === void 0) { mode = "master"; }
         var _this = _super.call(this) || this;
         /**
          * Stores all executed queries to be able to run them again if transaction fails.
@@ -94,26 +93,42 @@ var CockroachQueryRunner = /** @class */ (function (_super) {
      */
     CockroachQueryRunner.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();
+                        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:
                         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_1.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*/];
                 }
             });
         });
@@ -124,41 +139,80 @@ var CockroachQueryRunner = /** @class */ (function (_super) {
      */
     CockroachQueryRunner.prototype.commitTransaction = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var e_1;
-            var _this = this;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
+            var beforeBroadcastResult, e_1, _a, _b, q, e_2_1, afterBroadcastResult;
+            var e_2, _c;
+            return tslib_1.__generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
                         if (!this.isTransactionActive)
                             throw new TransactionNotStartedError_1.TransactionNotStartedError();
-                        this.storeQueries = false;
-                        _a.label = 1;
+                        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.trys.push([1, 4, , 9]);
-                        return [4 /*yield*/, this.query("RELEASE SAVEPOINT cockroach_restart")];
+                        _d.sent();
+                        _d.label = 2;
                     case 2:
-                        _a.sent();
-                        return [4 /*yield*/, this.query("COMMIT")];
+                        this.storeQueries = false;
+                        _d.label = 3;
                     case 3:
-                        _a.sent();
-                        this.queries = [];
-                        this.isTransactionActive = false;
-                        return [3 /*break*/, 9];
+                        _d.trys.push([3, 6, , 18]);
+                        return [4 /*yield*/, this.query("RELEASE SAVEPOINT cockroach_restart")];
                     case 4:
-                        e_1 = _a.sent();
-                        if (!(e_1.code === "40001")) return [3 /*break*/, 8];
-                        return [4 /*yield*/, this.query("ROLLBACK TO SAVEPOINT cockroach_restart")];
+                        _d.sent();
+                        return [4 /*yield*/, this.query("COMMIT")];
                     case 5:
-                        _a.sent();
-                        return [4 /*yield*/, __1.PromiseUtils.runInSequence(this.queries, function (q) { return _this.query(q.query, q.parameters); })];
+                        _d.sent();
+                        this.queries = [];
+                        this.isTransactionActive = false;
+                        return [3 /*break*/, 18];
                     case 6:
-                        _a.sent();
-                        return [4 /*yield*/, this.commitTransaction()];
+                        e_1 = _d.sent();
+                        if (!(e_1.code === "40001")) return [3 /*break*/, 17];
+                        return [4 /*yield*/, this.query("ROLLBACK TO SAVEPOINT cockroach_restart")];
                     case 7:
-                        _a.sent();
-                        _a.label = 8;
-                    case 8: return [3 /*break*/, 9];
-                    case 9: return [2 /*return*/];
+                        _d.sent();
+                        _d.label = 8;
+                    case 8:
+                        _d.trys.push([8, 13, 14, 15]);
+                        _a = tslib_1.__values(this.queries), _b = _a.next();
+                        _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 10:
+                        _d.sent();
+                        _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*/, 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 15: return [4 /*yield*/, this.commitTransaction()];
+                    case 16:
+                        _d.sent();
+                        _d.label = 17;
+                    case 17: return [3 /*break*/, 18];
+                    case 18:
+                        afterBroadcastResult = new BroadcasterResult_1.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 = 20;
+                    case 20: return [2 /*return*/];
                 }
             });
         });
@@ -169,18 +223,34 @@ var CockroachQueryRunner = /** @class */ (function (_super) {
      */
     CockroachQueryRunner.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();
+                        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:
                         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_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*/];
                 }
             });
         });
@@ -755,6 +825,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_1.Query("COMMENT ON COLUMN " + this.escapePath(table) + ".\"" + column.name + "\" IS " + this.escapeComment(column.comment)));
+                            downQueries.push(new Query_1.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();
@@ -770,13 +845,36 @@ var CockroachQueryRunner = /** @class */ (function (_super) {
      */
     CockroachQueryRunner.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*/, __1.PromiseUtils.runInSequence(columns, function (column) { return _this.addColumn(tableOrName, column); })];
+            var columns_1, columns_1_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_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_3_1 = _b.sent();
+                        e_3 = { error: e_3_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_3) throw e_3.error; }
+                        return [7 /*endfinally*/];
+                    case 7: return [2 /*return*/];
                 }
             });
         });
@@ -928,8 +1026,8 @@ var CockroachQueryRunner = /** @class */ (function (_super) {
                             }
                         }
                         if (oldColumn.comment !== newColumn.comment) {
-                            upQueries.push(new Query_1.Query("COMMENT ON COLUMN " + this.escapePath(table) + ".\"" + oldColumn.name + "\" IS '" + newColumn.comment + "'"));
-                            downQueries.push(new Query_1.Query("COMMENT ON COLUMN " + this.escapePath(table) + ".\"" + newColumn.name + "\" IS '" + oldColumn.comment + "'"));
+                            upQueries.push(new Query_1.Query("COMMENT ON COLUMN " + this.escapePath(table) + ".\"" + oldColumn.name + "\" IS " + this.escapeComment(newColumn.comment)));
+                            downQueries.push(new Query_1.Query("COMMENT ON COLUMN " + this.escapePath(table) + ".\"" + newColumn.name + "\" IS " + this.escapeComment(oldColumn.comment)));
                         }
                         if (newColumn.isPrimary !== oldColumn.isPrimary) {
                             primaryColumns = clonedTable.primaryColumns;
@@ -1031,13 +1129,36 @@ var CockroachQueryRunner = /** @class */ (function (_super) {
      */
     CockroachQueryRunner.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*/, __1.PromiseUtils.runInSequence(changedColumns, function (changedColumn) { return _this.changeColumn(tableOrName, changedColumn.oldColumn, changedColumn.newColumn); })];
+            var changedColumns_1, changedColumns_1_1, _a, oldColumn, newColumn, e_4_1;
+            var e_4, _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_4_1 = _c.sent();
+                        e_4 = { error: e_4_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_4) throw e_4.error; }
+                        return [7 /*endfinally*/];
+                    case 7: return [2 /*return*/];
                 }
             });
         });
@@ -1122,13 +1243,36 @@ var CockroachQueryRunner = /** @class */ (function (_super) {
      */
     CockroachQueryRunner.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*/, __1.PromiseUtils.runInSequence(columns, function (column) { return _this.dropColumn(tableOrName, column); })];
+            var columns_2, columns_2_1, column, e_5_1;
+            var e_5, _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_5_1 = _b.sent();
+                        e_5 = { error: e_5_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_5) throw e_5.error; }
+                        return [7 /*endfinally*/];
+                    case 7: return [2 /*return*/];
                 }
             });
         });
@@ -1282,13 +1426,36 @@ var CockroachQueryRunner = /** @class */ (function (_super) {
      */
     CockroachQueryRunner.prototype.createUniqueConstraints = function (tableOrName, uniqueConstraints) {
         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*/, __1.PromiseUtils.runInSequence(uniqueConstraints, function (uniqueConstraint) { return _this.createUniqueConstraint(tableOrName, uniqueConstraint); })];
+            var uniqueConstraints_1, uniqueConstraints_1_1, uniqueConstraint, e_6_1;
+            var e_6, _a;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _b.trys.push([0, 5, 6, 7]);
+                        uniqueConstraints_1 = tslib_1.__values(uniqueConstraints), uniqueConstraints_1_1 = uniqueConstraints_1.next();
+                        _b.label = 1;
                     case 1:
-                        _a.sent();
-                        return [2 /*return*/];
+                        if (!!uniqueConstraints_1_1.done) return [3 /*break*/, 4];
+                        uniqueConstraint = uniqueConstraints_1_1.value;
+                        return [4 /*yield*/, this.createUniqueConstraint(tableOrName, uniqueConstraint)];
+                    case 2:
+                        _b.sent();
+                        _b.label = 3;
+                    case 3:
+                        uniqueConstraints_1_1 = uniqueConstraints_1.next();
+                        return [3 /*break*/, 1];
+                    case 4: return [3 /*break*/, 7];
+                    case 5:
+                        e_6_1 = _b.sent();
+                        e_6 = { error: e_6_1 };
+                        return [3 /*break*/, 7];
+                    case 6:
+                        try {
+                            if (uniqueConstraints_1_1 && !uniqueConstraints_1_1.done && (_a = uniqueConstraints_1.return)) _a.call(uniqueConstraints_1);
+                        }
+                        finally { if (e_6) throw e_6.error; }
+                        return [7 /*endfinally*/];
+                    case 7: return [2 /*return*/];
                 }
             });
         });
@@ -1330,13 +1497,36 @@ var CockroachQueryRunner = /** @class */ (function (_super) {
      */
     CockroachQueryRunner.prototype.dropUniqueConstraints = function (tableOrName, uniqueConstraints) {
         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*/, __1.PromiseUtils.runInSequence(uniqueConstraints, function (uniqueConstraint) { return _this.dropUniqueConstraint(tableOrName, uniqueConstraint); })];
+            var uniqueConstraints_2, uniqueConstraints_2_1, uniqueConstraint, e_7_1;
+            var e_7, _a;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _b.trys.push([0, 5, 6, 7]);
+                        uniqueConstraints_2 = tslib_1.__values(uniqueConstraints), uniqueConstraints_2_1 = uniqueConstraints_2.next();
+                        _b.label = 1;
                     case 1:
-                        _a.sent();
-                        return [2 /*return*/];
+                        if (!!uniqueConstraints_2_1.done) return [3 /*break*/, 4];
+                        uniqueConstraint = uniqueConstraints_2_1.value;
+                        return [4 /*yield*/, this.dropUniqueConstraint(tableOrName, uniqueConstraint)];
+                    case 2:
+                        _b.sent();
+                        _b.label = 3;
+                    case 3:
+                        uniqueConstraints_2_1 = uniqueConstraints_2.next();
+                        return [3 /*break*/, 1];
+                    case 4: return [3 /*break*/, 7];
+                    case 5:
+                        e_7_1 = _b.sent();
+                        e_7 = { error: e_7_1 };
+                        return [3 /*break*/, 7];
+                    case 6:
+                        try {
+                            if (uniqueConstraints_2_1 && !uniqueConstraints_2_1.done && (_a = uniqueConstraints_2.return)) _a.call(uniqueConstraints_2);
+                        }
+                        finally { if (e_7) throw e_7.error; }
+                        return [7 /*endfinally*/];
+                    case 7: return [2 /*return*/];
                 }
             });
         });
@@ -1520,13 +1710,36 @@ var CockroachQueryRunner = /** @class */ (function (_super) {
      */
     CockroachQueryRunner.prototype.createForeignKeys = function (tableOrName, foreignKeys) {
         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*/, __1.PromiseUtils.runInSequence(foreignKeys, function (foreignKey) { return _this.createForeignKey(tableOrName, foreignKey); })];
+            var foreignKeys_1, foreignKeys_1_1, foreignKey, e_8_1;
+            var e_8, _a;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _b.trys.push([0, 5, 6, 7]);
+                        foreignKeys_1 = tslib_1.__values(foreignKeys), foreignKeys_1_1 = foreignKeys_1.next();
+                        _b.label = 1;
                     case 1:
-                        _a.sent();
-                        return [2 /*return*/];
+                        if (!!foreignKeys_1_1.done) return [3 /*break*/, 4];
+                        foreignKey = foreignKeys_1_1.value;
+                        return [4 /*yield*/, this.createForeignKey(tableOrName, foreignKey)];
+                    case 2:
+                        _b.sent();
+                        _b.label = 3;
+                    case 3:
+                        foreignKeys_1_1 = foreignKeys_1.next();
+                        return [3 /*break*/, 1];
+                    case 4: return [3 /*break*/, 7];
+                    case 5:
+                        e_8_1 = _b.sent();
+                        e_8 = { error: e_8_1 };
+                        return [3 /*break*/, 7];
+                    case 6:
+                        try {
+                            if (foreignKeys_1_1 && !foreignKeys_1_1.done && (_a = foreignKeys_1.return)) _a.call(foreignKeys_1);
+                        }
+                        finally { if (e_8) throw e_8.error; }
+                        return [7 /*endfinally*/];
+                    case 7: return [2 /*return*/];
                 }
             });
         });
@@ -1568,13 +1781,36 @@ var CockroachQueryRunner = /** @class */ (function (_super) {
      */
     CockroachQueryRunner.prototype.dropForeignKeys = function (tableOrName, foreignKeys) {
         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*/, __1.PromiseUtils.runInSequence(foreignKeys, function (foreignKey) { return _this.dropForeignKey(tableOrName, foreignKey); })];
+            var foreignKeys_2, foreignKeys_2_1, foreignKey, e_9_1;
+            var e_9, _a;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _b.trys.push([0, 5, 6, 7]);
+                        foreignKeys_2 = tslib_1.__values(foreignKeys), foreignKeys_2_1 = foreignKeys_2.next();
+                        _b.label = 1;
                     case 1:
-                        _a.sent();
-                        return [2 /*return*/];
+                        if (!!foreignKeys_2_1.done) return [3 /*break*/, 4];
+                        foreignKey = foreignKeys_2_1.value;
+                        return [4 /*yield*/, this.dropForeignKey(tableOrName, foreignKey)];
+                    case 2:
+                        _b.sent();
+                        _b.label = 3;
+                    case 3:
+                        foreignKeys_2_1 = foreignKeys_2.next();
+                        return [3 /*break*/, 1];
+                    case 4: return [3 /*break*/, 7];
+                    case 5:
+                        e_9_1 = _b.sent();
+                        e_9 = { error: e_9_1 };
+                        return [3 /*break*/, 7];
+                    case 6:
+                        try {
+                            if (foreignKeys_2_1 && !foreignKeys_2_1.done && (_a = foreignKeys_2.return)) _a.call(foreignKeys_2);
+                        }
+                        finally { if (e_9) throw e_9.error; }
+                        return [7 /*endfinally*/];
+                    case 7: return [2 /*return*/];
                 }
             });
         });
@@ -1630,13 +1866,36 @@ var CockroachQueryRunner = /** @class */ (function (_super) {
      */
     CockroachQueryRunner.prototype.createIndices = function (tableOrName, indices) {
         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*/, __1.PromiseUtils.runInSequence(indices, function (index) { return _this.createIndex(tableOrName, index); })];
+            var indices_1, indices_1_1, index, e_10_1;
+            var e_10, _a;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _b.trys.push([0, 5, 6, 7]);
+                        indices_1 = tslib_1.__values(indices), indices_1_1 = indices_1.next();
+                        _b.label = 1;
                     case 1:
-                        _a.sent();
-                        return [2 /*return*/];
+                        if (!!indices_1_1.done) return [3 /*break*/, 4];
+                        index = indices_1_1.value;
+                        return [4 /*yield*/, this.createIndex(tableOrName, index)];
+                    case 2:
+                        _b.sent();
+                        _b.label = 3;
+                    case 3:
+                        indices_1_1 = indices_1.next();
+                        return [3 /*break*/, 1];
+                    case 4: return [3 /*break*/, 7];
+                    case 5:
+                        e_10_1 = _b.sent();
+                        e_10 = { error: e_10_1 };
+                        return [3 /*break*/, 7];
+                    case 6:
+                        try {
+                            if (indices_1_1 && !indices_1_1.done && (_a = indices_1.return)) _a.call(indices_1);
+                        }
+                        finally { if (e_10) throw e_10.error; }
+                        return [7 /*endfinally*/];
+                    case 7: return [2 /*return*/];
                 }
             });
         });
@@ -1678,13 +1937,36 @@ var CockroachQueryRunner = /** @class */ (function (_super) {
      */
     CockroachQueryRunner.prototype.dropIndices = function (tableOrName, indices) {
         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*/, __1.PromiseUtils.runInSequence(indices, function (index) { return _this.dropIndex(tableOrName, index); })];
+            var indices_2, indices_2_1, index, e_11_1;
+            var e_11, _a;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _b.trys.push([0, 5, 6, 7]);
+                        indices_2 = tslib_1.__values(indices), indices_2_1 = indices_2.next();
+                        _b.label = 1;
                     case 1:
-                        _a.sent();
-                        return [2 /*return*/];
+                        if (!!indices_2_1.done) return [3 /*break*/, 4];
+                        index = indices_2_1.value;
+                        return [4 /*yield*/, this.dropIndex(tableOrName, index)];
+                    case 2:
+                        _b.sent();
+                        _b.label = 3;
+                    case 3:
+                        indices_2_1 = indices_2.next();
+                        return [3 /*break*/, 1];
+                    case 4: return [3 /*break*/, 7];
+                    case 5:
+                        e_11_1 = _b.sent();
+                        e_11 = { error: e_11_1 };
+                        return [3 /*break*/, 7];
+                    case 6:
+                        try {
+                            if (indices_2_1 && !indices_2_1.done && (_a = indices_2.return)) _a.call(indices_2);
+                        }
+                        finally { if (e_11) throw e_11.error; }
+                        return [7 /*endfinally*/];
+                    case 7: return [2 /*return*/];
                 }
             });
         });
@@ -1845,7 +2127,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 = tslib_1.__read(tableName.split("."), 2), schema = _a[0], name = _a[1];
                             if (!name) {
@@ -1987,9 +2269,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];
@@ -2133,6 +2416,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_1.Query(sql);
     };
     /**
@@ -2307,6 +2593,18 @@ var CockroachQueryRunner = /** @class */ (function (_super) {
         var columnName = columnOrName instanceof TableColumn_1.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.
      */