typeorm 0.3.20-dev.15de46f → 0.3.20-dev.1b34c9a
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/browser/driver/oracle/OracleDriver.js +18 -10
- package/browser/driver/oracle/OracleDriver.js.map +1 -1
- package/browser/driver/oracle/OracleQueryRunner.js +2 -2
- package/browser/driver/oracle/OracleQueryRunner.js.map +1 -1
- package/browser/driver/postgres/PostgresQueryRunner.d.ts +1 -1
- package/browser/driver/postgres/PostgresQueryRunner.js +25 -5
- package/browser/driver/postgres/PostgresQueryRunner.js.map +1 -1
- package/browser/query-builder/InsertQueryBuilder.js +2 -1
- package/browser/query-builder/InsertQueryBuilder.js.map +1 -1
- package/browser/query-builder/SelectQueryBuilder.d.ts +4 -4
- package/browser/query-builder/SelectQueryBuilder.js +4 -4
- package/browser/query-builder/SelectQueryBuilder.js.map +1 -1
- package/browser/schema-builder/RdbmsSchemaBuilder.js +2 -1
- package/browser/schema-builder/RdbmsSchemaBuilder.js.map +1 -1
- package/driver/oracle/OracleDriver.js +18 -10
- package/driver/oracle/OracleDriver.js.map +1 -1
- package/driver/oracle/OracleQueryRunner.js +2 -2
- package/driver/oracle/OracleQueryRunner.js.map +1 -1
- package/driver/postgres/PostgresQueryRunner.d.ts +1 -1
- package/driver/postgres/PostgresQueryRunner.js +25 -5
- package/driver/postgres/PostgresQueryRunner.js.map +1 -1
- package/package.json +1 -1
- package/query-builder/InsertQueryBuilder.js +2 -1
- package/query-builder/InsertQueryBuilder.js.map +1 -1
- package/query-builder/SelectQueryBuilder.d.ts +4 -4
- package/query-builder/SelectQueryBuilder.js +4 -4
- package/query-builder/SelectQueryBuilder.js.map +1 -1
- package/schema-builder/RdbmsSchemaBuilder.js +2 -1
- package/schema-builder/RdbmsSchemaBuilder.js.map +1 -1
|
@@ -415,5 +415,5 @@ export declare class PostgresQueryRunner extends BaseQueryRunner implements Quer
|
|
|
415
415
|
/**
|
|
416
416
|
* Change table comment.
|
|
417
417
|
*/
|
|
418
|
-
changeTableComment(tableOrName: Table | string,
|
|
418
|
+
changeTableComment(tableOrName: Table | string, newComment?: string): Promise<void>;
|
|
419
419
|
}
|
|
@@ -415,6 +415,10 @@ export class PostgresQueryRunner extends BaseQueryRunner {
|
|
|
415
415
|
downQueries.push(this.dropIndexSql(table, index));
|
|
416
416
|
});
|
|
417
417
|
}
|
|
418
|
+
if (table.comment) {
|
|
419
|
+
upQueries.push(new Query("COMMENT ON TABLE " + this.escapePath(table) + " IS '" + table.comment + "'"));
|
|
420
|
+
downQueries.push(new Query("COMMENT ON TABLE " + this.escapePath(table) + " IS NULL"));
|
|
421
|
+
}
|
|
418
422
|
await this.executeQueries(upQueries, downQueries);
|
|
419
423
|
}
|
|
420
424
|
/**
|
|
@@ -1736,7 +1740,7 @@ export class PostgresQueryRunner extends BaseQueryRunner {
|
|
|
1736
1740
|
const currentDatabase = await this.getCurrentDatabase();
|
|
1737
1741
|
const dbTables = [];
|
|
1738
1742
|
if (!tableNames) {
|
|
1739
|
-
const tablesSql = `SELECT "table_schema", "table_name" FROM "information_schema"."tables"`;
|
|
1743
|
+
const tablesSql = `SELECT "table_schema", "table_name", obj_description(('"' || "table_schema" || '"."' || "table_name" || '"')::regclass, 'pg_class') AS table_comment FROM "information_schema"."tables"`;
|
|
1740
1744
|
dbTables.push(...(await this.query(tablesSql)));
|
|
1741
1745
|
}
|
|
1742
1746
|
else {
|
|
@@ -1746,7 +1750,7 @@ export class PostgresQueryRunner extends BaseQueryRunner {
|
|
|
1746
1750
|
return `("table_schema" = '${schema || currentSchema}' AND "table_name" = '${tableName}')`;
|
|
1747
1751
|
})
|
|
1748
1752
|
.join(" OR ");
|
|
1749
|
-
const tablesSql = `SELECT "table_schema", "table_name" FROM "information_schema"."tables" WHERE ` +
|
|
1753
|
+
const tablesSql = `SELECT "table_schema", "table_name", obj_description(('"' || "table_schema" || '"."' || "table_name" || '"')::regclass, 'pg_class') AS table_comment FROM "information_schema"."tables" WHERE ` +
|
|
1750
1754
|
tablesCondition;
|
|
1751
1755
|
dbTables.push(...(await this.query(tablesSql)));
|
|
1752
1756
|
}
|
|
@@ -1848,6 +1852,7 @@ export class PostgresQueryRunner extends BaseQueryRunner {
|
|
|
1848
1852
|
const schema = getSchemaFromKey(dbTable, "table_schema");
|
|
1849
1853
|
table.database = currentDatabase;
|
|
1850
1854
|
table.schema = dbTable["table_schema"];
|
|
1855
|
+
table.comment = dbTable["table_comment"];
|
|
1851
1856
|
table.name = this.driver.buildTableName(dbTable["table_name"], schema);
|
|
1852
1857
|
// create columns from the loaded columns
|
|
1853
1858
|
table.columns = await Promise.all(dbColumns
|
|
@@ -2414,7 +2419,7 @@ export class PostgresQueryRunner extends BaseQueryRunner {
|
|
|
2414
2419
|
* Builds drop index sql.
|
|
2415
2420
|
*/
|
|
2416
2421
|
dropIndexSql(table, indexOrName) {
|
|
2417
|
-
|
|
2422
|
+
const indexName = InstanceChecker.isTableIndex(indexOrName)
|
|
2418
2423
|
? indexOrName.name
|
|
2419
2424
|
: indexOrName;
|
|
2420
2425
|
const concurrent = InstanceChecker.isTableIndex(indexOrName)
|
|
@@ -2686,8 +2691,23 @@ export class PostgresQueryRunner extends BaseQueryRunner {
|
|
|
2686
2691
|
/**
|
|
2687
2692
|
* Change table comment.
|
|
2688
2693
|
*/
|
|
2689
|
-
changeTableComment(tableOrName,
|
|
2690
|
-
|
|
2694
|
+
async changeTableComment(tableOrName, newComment) {
|
|
2695
|
+
const upQueries = [];
|
|
2696
|
+
const downQueries = [];
|
|
2697
|
+
const table = InstanceChecker.isTable(tableOrName)
|
|
2698
|
+
? tableOrName
|
|
2699
|
+
: await this.getCachedTable(tableOrName);
|
|
2700
|
+
newComment = this.escapeComment(newComment);
|
|
2701
|
+
const comment = this.escapeComment(table.comment);
|
|
2702
|
+
if (newComment === comment) {
|
|
2703
|
+
return;
|
|
2704
|
+
}
|
|
2705
|
+
const newTable = table.clone();
|
|
2706
|
+
upQueries.push(new Query(`COMMENT ON TABLE ${this.escapePath(newTable)} IS ${newComment}`));
|
|
2707
|
+
downQueries.push(new Query(`COMMENT ON TABLE ${this.escapePath(table)} IS ${comment}`));
|
|
2708
|
+
await this.executeQueries(upQueries, downQueries);
|
|
2709
|
+
table.comment = newTable.comment;
|
|
2710
|
+
this.replaceCachedTable(table, newTable);
|
|
2691
2711
|
}
|
|
2692
2712
|
}
|
|
2693
2713
|
|