typeorm 0.2.28 → 0.2.29

package/browser/driver/postgres/PostgresQueryRunner.js

@@ -15,6 +15,7 @@ import { View } from "../../schema-builder/view/View";
 import { Broadcaster } from "../../subscriber/Broadcaster";
 import { OrmUtils } from "../../util/OrmUtils";
 import { Query } from "../Query";
+import { BroadcasterResult } from "../../subscriber/BroadcasterResult";
 /**
  * Runs queries on a single postgres database connection.
  */
@@ -95,21 +96,38 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      */
     PostgresQueryRunner.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();
-                        if (!isolationLevel) return [3 /*break*/, 3];
+                        if (!isolationLevel) return [3 /*break*/, 5];
                         return [4 /*yield*/, this.query("SET TRANSACTION ISOLATION LEVEL " + isolationLevel)];
-                    case 2:
+                    case 4:
                         _a.sent();
-                        _a.label = 3;
-                    case 3: return [2 /*return*/];
+                        _a.label = 5;
+                    case 5:
+                        afterBroadcastResult = new BroadcasterResult();
+                        this.broadcaster.broadcastAfterTransactionStartEvent(afterBroadcastResult);
+                        if (!(afterBroadcastResult.promises.length > 0)) return [3 /*break*/, 7];
+                        return [4 /*yield*/, Promise.all(afterBroadcastResult.promises)];
+                    case 6:
+                        _a.sent();
+                        _a.label = 7;
+                    case 7: return [2 /*return*/];
                 }
             });
         });
@@ -120,16 +138,31 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      */
     PostgresQueryRunner.prototype.commitTransaction = 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();
-                        return [4 /*yield*/, this.query("COMMIT")];
+                        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 [4 /*yield*/, this.query("COMMIT")];
+                    case 3:
                         _a.sent();
                         this.isTransactionActive = false;
-                        return [2 /*return*/];
+                        afterBroadcastResult = new 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*/];
                 }
             });
         });
@@ -140,16 +173,31 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      */
     PostgresQueryRunner.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();
-                        return [4 /*yield*/, this.query("ROLLBACK")];
+                        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 [4 /*yield*/, this.query("ROLLBACK")];
+                    case 3:
                         _a.sent();
                         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*/];
                 }
             });
         });
@@ -736,6 +784,11 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                             upQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " ADD CONSTRAINT \"" + uniqueConstraint.name + "\" UNIQUE (\"" + column.name + "\")"));
                             downQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " DROP CONSTRAINT \"" + uniqueConstraint.name + "\""));
                         }
+                        // 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 6:
                         _b.sent();
@@ -987,8 +1040,8 @@ var PostgresQueryRunner = /** @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;
@@ -2117,7 +2170,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      */
     PostgresQueryRunner.prototype.loadTables = function (tableNames) {
         return __awaiter(this, void 0, void 0, function () {
-            var currentSchemaQuery, currentSchema, tablesCondition, tablesSql, columnsSql, constraintsCondition, constraintsSql, indicesSql, foreignKeysCondition, foreignKeysSql, _a, dbTables, dbColumns, dbConstraints, dbIndices, dbForeignKeys;
+            var currentSchemaQuery, currentSchema, tablesCondition, tablesSql, columnsSql, constraintsCondition, constraintsSql, indicesSql, foreignKeysCondition, hasRelispartitionColumn, isPartitionCondition, foreignKeysSql, _a, dbTables, dbColumns, dbConstraints, dbIndices, dbForeignKeys;
             var _this = this;
             return __generator(this, function (_b) {
                 switch (_b.label) {
@@ -2138,7 +2191,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                             return "(\"table_schema\" = '" + schema + "' AND \"table_name\" = '" + name + "')";
                         }).join(" OR ");
                         tablesSql = "SELECT * FROM \"information_schema\".\"tables\" WHERE " + tablesCondition;
-                        columnsSql = "SELECT *, ('\"' || \"udt_schema\" || '\".\"' || \"udt_name\" || '\"')::\"regtype\" AS \"regtype\" FROM \"information_schema\".\"columns\" WHERE " + tablesCondition;
+                        columnsSql = "\n            SELECT\n                *,\n                pg_catalog.col_description(('\"' || table_catalog || '\".\"' || table_schema || '\".\"' || table_name || '\"')::regclass::oid, ordinal_position) as description,\n                ('\"' || \"udt_schema\" || '\".\"' || \"udt_name\" || '\"')::\"regtype\" AS \"regtype\"\n            FROM \"information_schema\".\"columns\"\n            WHERE\n            " + tablesCondition;
                         constraintsCondition = tableNames.map(function (tableName) {
                             var _a = __read(tableName.split("."), 2), schema = _a[0], name = _a[1];
                             if (!name) {
@@ -2154,7 +2207,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                             "INNER JOIN \"pg_class\" \"t\" ON \"t\".\"oid\" = \"cnst\".\"conrelid\" " +
                             "INNER JOIN \"pg_namespace\" \"ns\" ON \"ns\".\"oid\" = \"cnst\".\"connamespace\" " +
                             "LEFT JOIN \"pg_attribute\" \"a\" ON \"a\".\"attrelid\" = \"cnst\".\"conrelid\" AND \"a\".\"attnum\" = ANY (\"cnst\".\"conkey\") " +
-                            ("WHERE \"t\".\"relkind\" = 'r' AND (" + constraintsCondition + ")");
+                            ("WHERE \"t\".\"relkind\" IN ('r', 'p') AND (" + constraintsCondition + ")");
                         indicesSql = "SELECT \"ns\".\"nspname\" AS \"table_schema\", \"t\".\"relname\" AS \"table_name\", \"i\".\"relname\" AS \"constraint_name\", \"a\".\"attname\" AS \"column_name\", " +
                             "CASE \"ix\".\"indisunique\" WHEN 't' THEN 'TRUE' ELSE'FALSE' END AS \"is_unique\", pg_get_expr(\"ix\".\"indpred\", \"ix\".\"indrelid\") AS \"condition\", " +
                             "\"types\".\"typname\" AS \"type_name\" " +
@@ -2165,7 +2218,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                             "INNER JOIN \"pg_class\" \"i\" ON \"i\".\"oid\" = \"ix\".\"indexrelid\" " +
                             "INNER JOIN \"pg_type\" \"types\" ON \"types\".\"oid\" = \"a\".\"atttypid\" " +
                             "LEFT JOIN \"pg_constraint\" \"cnst\" ON \"cnst\".\"conname\" = \"i\".\"relname\" " +
-                            ("WHERE \"t\".\"relkind\" = 'r' AND \"cnst\".\"contype\" IS NULL AND (" + constraintsCondition + ")");
+                            ("WHERE \"t\".\"relkind\" IN ('r', 'p') AND \"cnst\".\"contype\" IS NULL AND (" + constraintsCondition + ")");
                         foreignKeysCondition = tableNames.map(function (tableName) {
                             var _a = __read(tableName.split("."), 2), schema = _a[0], name = _a[1];
                             if (!name) {
@@ -2174,6 +2227,10 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                             }
                             return "(\"ns\".\"nspname\" = '" + schema + "' AND \"cl\".\"relname\" = '" + name + "')";
                         }).join(" OR ");
+                        return [4 /*yield*/, this.hasSupportForPartitionedTables()];
+                    case 2:
+                        hasRelispartitionColumn = _b.sent();
+                        isPartitionCondition = hasRelispartitionColumn ? " AND \"cl\".\"relispartition\" = 'f'" : "";
                         foreignKeysSql = "SELECT \"con\".\"conname\" AS \"constraint_name\", \"con\".\"nspname\" AS \"table_schema\", \"con\".\"relname\" AS \"table_name\", \"att2\".\"attname\" AS \"column_name\", " +
                             "\"ns\".\"nspname\" AS \"referenced_table_schema\", \"cl\".\"relname\" AS \"referenced_table_name\", \"att\".\"attname\" AS \"referenced_column_name\", \"con\".\"confdeltype\" AS \"on_delete\", " +
                             "\"con\".\"confupdtype\" AS \"on_update\", \"con\".\"condeferrable\" AS \"deferrable\", \"con\".\"condeferred\" AS \"deferred\" " +
@@ -2189,7 +2246,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                             ("WHERE \"con1\".\"contype\" = 'f' AND (" + foreignKeysCondition + ") ") +
                             ") \"con\" " +
                             "INNER JOIN \"pg_attribute\" \"att\" ON \"att\".\"attrelid\" = \"con\".\"confrelid\" AND \"att\".\"attnum\" = \"con\".\"child\" " +
-                            "INNER JOIN \"pg_class\" \"cl\" ON \"cl\".\"oid\" = \"con\".\"confrelid\" " +
+                            ("INNER JOIN \"pg_class\" \"cl\" ON \"cl\".\"oid\" = \"con\".\"confrelid\" " + isPartitionCondition) +
                             "INNER JOIN \"pg_namespace\" \"ns\" ON \"cl\".\"relnamespace\" = \"ns\".\"oid\" " +
                             "INNER JOIN \"pg_attribute\" \"att2\" ON \"att2\".\"attrelid\" = \"con\".\"conrelid\" AND \"att2\".\"attnum\" = \"con\".\"parent\"";
                         return [4 /*yield*/, Promise.all([
@@ -2199,7 +2256,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                                 this.query(indicesSql),
                                 this.query(foreignKeysSql),
                             ])];
-                    case 2:
+                    case 3:
                         _a = __read.apply(void 0, [_b.sent(), 5]), dbTables = _a[0], dbColumns = _a[1], dbConstraints = _a[2], dbIndices = _a[3], dbForeignKeys = _a[4];
                         // if tables were not found in the db, no need to proceed
                         if (!dbTables.length)
@@ -2315,9 +2372,10 @@ var PostgresQueryRunner = /** @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"];
                                                                 if (dbColumn["collation_name"])
@@ -2470,6 +2528,9 @@ var PostgresQueryRunner = /** @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);
     };
     /**
@@ -2789,6 +2850,18 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
             });
         });
     };
+    /**
+     * Escapes a given comment so it's safe to include in a query.
+     */
+    PostgresQueryRunner.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.
      */
@@ -2850,6 +2923,22 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
             c += " DEFAULT " + this.driver.uuidGenerator;
         return c;
     };
+    /**
+     * Checks if the PostgreSQL server has support for partitioned tables
+     */
+    PostgresQueryRunner.prototype.hasSupportForPartitionedTables = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var result;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.query("SELECT TRUE FROM information_schema.columns WHERE table_name = 'pg_class' and column_name = 'relispartition'")];
+                    case 1:
+                        result = _a.sent();
+                        return [2 /*return*/, result.length ? true : false];
+                }
+            });
+        });
+    };
     return PostgresQueryRunner;
 }(BaseQueryRunner));
 export { PostgresQueryRunner };