typeorm 0.3.20-dev.fa86f6f → 0.3.21-dev.19a6954

package/browser/driver/postgres/PostgresQueryRunner.js

@@ -415,6 +415,14 @@ export class PostgresQueryRunner extends BaseQueryRunner {
                 downQueries.push(this.dropIndexSql(table, index));
             });
         }
+        if (table.comment) {
+            upQueries.push(new Query("COMMENT ON TABLE " +
+                this.escapePath(table) +
+                " IS '" +
+                table.comment +
+                "'"));
+            downQueries.push(new Query("COMMENT ON TABLE " + this.escapePath(table) + " IS NULL"));
+        }
         await this.executeQueries(upQueries, downQueries);
     }
     /**
@@ -1233,7 +1241,6 @@ export class PostgresQueryRunner extends BaseQueryRunner {
      * Updates composite primary keys.
      */
     async updatePrimaryKeys(tableOrName, columns) {
-        var _a;
         const table = InstanceChecker.isTable(tableOrName)
             ? tableOrName
             : await this.getCachedTable(tableOrName);
@@ -1257,7 +1264,7 @@ export class PostgresQueryRunner extends BaseQueryRunner {
         clonedTable.columns
             .filter((column) => columnNames.indexOf(column.name) !== -1)
             .forEach((column) => (column.isPrimary = true));
-        const pkName = ((_a = primaryColumns[0]) === null || _a === void 0 ? void 0 : _a.primaryKeyConstraintName)
+        const pkName = primaryColumns[0]?.primaryKeyConstraintName
             ? primaryColumns[0].primaryKeyConstraintName
             : this.connection.namingStrategy.primaryKeyName(clonedTable, columnNames);
         const columnNamesString = columnNames
@@ -1737,7 +1744,7 @@ export class PostgresQueryRunner extends BaseQueryRunner {
         const currentDatabase = await this.getCurrentDatabase();
         const dbTables = [];
         if (!tableNames) {
-            const tablesSql = `SELECT "table_schema", "table_name" FROM "information_schema"."tables"`;
+            const tablesSql = `SELECT "table_schema", "table_name", obj_description(('"' || "table_schema" || '"."' || "table_name" || '"')::regclass, 'pg_class') AS table_comment FROM "information_schema"."tables"`;
             dbTables.push(...(await this.query(tablesSql)));
         }
         else {
@@ -1747,7 +1754,7 @@ export class PostgresQueryRunner extends BaseQueryRunner {
                 return `("table_schema" = '${schema || currentSchema}' AND "table_name" = '${tableName}')`;
             })
                 .join(" OR ");
-            const tablesSql = `SELECT "table_schema", "table_name" FROM "information_schema"."tables" WHERE ` +
+            const tablesSql = `SELECT "table_schema", "table_name", obj_description(('"' || "table_schema" || '"."' || "table_name" || '"')::regclass, 'pg_class') AS table_comment FROM "information_schema"."tables" WHERE ` +
                 tablesCondition;
             dbTables.push(...(await this.query(tablesSql)));
         }
@@ -1849,6 +1856,7 @@ export class PostgresQueryRunner extends BaseQueryRunner {
             const schema = getSchemaFromKey(dbTable, "table_schema");
             table.database = currentDatabase;
             table.schema = dbTable["table_schema"];
+            table.comment = dbTable["table_comment"];
             table.name = this.driver.buildTableName(dbTable["table_name"], schema);
             // create columns from the loaded columns
             table.columns = await Promise.all(dbColumns
@@ -2048,7 +2056,7 @@ export class PostgresQueryRunner extends BaseQueryRunner {
                             dbColumn["column_default"];
                     }
                     else {
-                        tableColumn.default = dbColumn["column_default"].replace(/::[\w\s.\[\]\-"]+/g, "");
+                        tableColumn.default = dbColumn["column_default"].replace(/::[\w\s.[\]\-"]+/g, "");
                         tableColumn.default =
                             tableColumn.default.replace(/^(-?\d+)$/, "'$1'");
                     }
@@ -2288,7 +2296,7 @@ export class PostgresQueryRunner extends BaseQueryRunner {
      */
     async getVersion() {
         const result = await this.query(`SELECT version()`);
-        return result[0]["version"].replace(/^PostgreSQL ([\d\.]+) .*$/, "$1");
+        return result[0]["version"].replace(/^PostgreSQL ([\d.]+) .*$/, "$1");
     }
     /**
      * Builds drop table sql.
@@ -2400,7 +2408,7 @@ export class PostgresQueryRunner extends BaseQueryRunner {
         const columns = index.columnNames
             .map((columnName) => `"${columnName}"`)
             .join(", ");
-        return new Query(`CREATE ${index.isUnique ? "UNIQUE " : ""}${index.isConcurrent ? "CONCURRENTLY " : ""}INDEX "${index.name}" ON ${this.escapePath(table)} ${index.isSpatial ? "USING GiST " : ""}(${columns}) ${index.where ? "WHERE " + index.where : ""}`);
+        return new Query(`CREATE ${index.isUnique ? "UNIQUE " : ""}INDEX${index.isConcurrent ? " CONCURRENTLY" : ""} "${index.name}" ON ${this.escapePath(table)} ${index.isSpatial ? "USING GiST " : ""}(${columns}) ${index.where ? "WHERE " + index.where : ""}`);
     }
     /**
      * Builds create view index sql.
@@ -2415,7 +2423,7 @@ export class PostgresQueryRunner extends BaseQueryRunner {
      * Builds drop index sql.
      */
     dropIndexSql(table, indexOrName) {
-        let indexName = InstanceChecker.isTableIndex(indexOrName)
+        const indexName = InstanceChecker.isTableIndex(indexOrName)
             ? indexOrName.name
             : indexOrName;
         const concurrent = InstanceChecker.isTableIndex(indexOrName)
@@ -2423,8 +2431,8 @@ export class PostgresQueryRunner extends BaseQueryRunner {
             : false;
         const { schema } = this.driver.parseTableName(table);
         return schema
-            ? new Query(`DROP INDEX ${concurrent ? "CONCURRENTLY" : ""}"${schema}"."${indexName}"`)
-            : new Query(`DROP INDEX ${concurrent ? "CONCURRENTLY" : ""}"${indexName}"`);
+            ? new Query(`DROP INDEX ${concurrent ? "CONCURRENTLY " : ""}"${schema}"."${indexName}"`)
+            : new Query(`DROP INDEX ${concurrent ? "CONCURRENTLY " : ""}"${indexName}"`);
     }
     /**
      * Builds create primary key sql.
@@ -2687,8 +2695,23 @@ export class PostgresQueryRunner extends BaseQueryRunner {
     /**
      * Change table comment.
      */
-    changeTableComment(tableOrName, comment) {
-        throw new TypeORMError(`postgres driver does not support change table comment.`);
+    async changeTableComment(tableOrName, newComment) {
+        const upQueries = [];
+        const downQueries = [];
+        const table = InstanceChecker.isTable(tableOrName)
+            ? tableOrName
+            : await this.getCachedTable(tableOrName);
+        newComment = this.escapeComment(newComment);
+        const comment = this.escapeComment(table.comment);
+        if (newComment === comment) {
+            return;
+        }
+        const newTable = table.clone();
+        upQueries.push(new Query(`COMMENT ON TABLE ${this.escapePath(newTable)} IS ${newComment}`));
+        downQueries.push(new Query(`COMMENT ON TABLE ${this.escapePath(table)} IS ${comment}`));
+        await this.executeQueries(upQueries, downQueries);
+        table.comment = newTable.comment;
+        this.replaceCachedTable(table, newTable);
     }
 }