typeorm 0.3.20-dev.62f574b → 0.3.20-dev.8ebe769

package/browser/driver/postgres/PostgresQueryRunner.d.ts

@@ -415,5 +415,5 @@ export declare class PostgresQueryRunner extends BaseQueryRunner implements Quer
     /**
      * Change table comment.
      */
-    changeTableComment(tableOrName: Table | string, newComment?: string): Promise<void>;
+    changeTableComment(tableOrName: Table | string, comment?: string): Promise<void>;
 }

package/browser/driver/postgres/PostgresQueryRunner.js

@@ -415,10 +415,6 @@ 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);
     }
     /**
@@ -1740,7 +1736,7 @@ export class PostgresQueryRunner extends BaseQueryRunner {
         const currentDatabase = await this.getCurrentDatabase();
         const dbTables = [];
         if (!tableNames) {
-            const tablesSql = `SELECT "table_schema", "table_name", obj_description(('"' || "table_schema" || '"."' || "table_name" || '"')::regclass, 'pg_class') AS table_comment FROM "information_schema"."tables"`;
+            const tablesSql = `SELECT "table_schema", "table_name" FROM "information_schema"."tables"`;
             dbTables.push(...(await this.query(tablesSql)));
         }
         else {
@@ -1750,7 +1746,7 @@ export class PostgresQueryRunner extends BaseQueryRunner {
                 return `("table_schema" = '${schema || currentSchema}' AND "table_name" = '${tableName}')`;
             })
                 .join(" OR ");
-            const tablesSql = `SELECT "table_schema", "table_name", obj_description(('"' || "table_schema" || '"."' || "table_name" || '"')::regclass, 'pg_class') AS table_comment FROM "information_schema"."tables" WHERE ` +
+            const tablesSql = `SELECT "table_schema", "table_name" FROM "information_schema"."tables" WHERE ` +
                 tablesCondition;
             dbTables.push(...(await this.query(tablesSql)));
         }
@@ -1852,7 +1848,6 @@ 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
@@ -2404,7 +2399,7 @@ export class PostgresQueryRunner extends BaseQueryRunner {
         const columns = index.columnNames
             .map((columnName) => `"${columnName}"`)
             .join(", ");
-        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 : ""}`);
+        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 : ""}`);
     }
     /**
      * Builds create view index sql.
@@ -2419,7 +2414,7 @@ export class PostgresQueryRunner extends BaseQueryRunner {
      * Builds drop index sql.
      */
     dropIndexSql(table, indexOrName) {
-        const indexName = InstanceChecker.isTableIndex(indexOrName)
+        let indexName = InstanceChecker.isTableIndex(indexOrName)
             ? indexOrName.name
             : indexOrName;
         const concurrent = InstanceChecker.isTableIndex(indexOrName)
@@ -2427,8 +2422,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.
@@ -2691,23 +2686,8 @@ export class PostgresQueryRunner extends BaseQueryRunner {
     /**
      * 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);
+    changeTableComment(tableOrName, comment) {
+        throw new TypeORMError(`postgres driver does not support change table comment.`);
     }
 }