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
|
}
|
|
@@ -418,6 +418,10 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
|
|
|
418
418
|
downQueries.push(this.dropIndexSql(table, index));
|
|
419
419
|
});
|
|
420
420
|
}
|
|
421
|
+
if (table.comment) {
|
|
422
|
+
upQueries.push(new Query_1.Query("COMMENT ON TABLE " + this.escapePath(table) + " IS '" + table.comment + "'"));
|
|
423
|
+
downQueries.push(new Query_1.Query("COMMENT ON TABLE " + this.escapePath(table) + " IS NULL"));
|
|
424
|
+
}
|
|
421
425
|
await this.executeQueries(upQueries, downQueries);
|
|
422
426
|
}
|
|
423
427
|
/**
|
|
@@ -1739,7 +1743,7 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
|
|
|
1739
1743
|
const currentDatabase = await this.getCurrentDatabase();
|
|
1740
1744
|
const dbTables = [];
|
|
1741
1745
|
if (!tableNames) {
|
|
1742
|
-
const tablesSql = `SELECT "table_schema", "table_name" FROM "information_schema"."tables"`;
|
|
1746
|
+
const tablesSql = `SELECT "table_schema", "table_name", obj_description(('"' || "table_schema" || '"."' || "table_name" || '"')::regclass, 'pg_class') AS table_comment FROM "information_schema"."tables"`;
|
|
1743
1747
|
dbTables.push(...(await this.query(tablesSql)));
|
|
1744
1748
|
}
|
|
1745
1749
|
else {
|
|
@@ -1749,7 +1753,7 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
|
|
|
1749
1753
|
return `("table_schema" = '${schema || currentSchema}' AND "table_name" = '${tableName}')`;
|
|
1750
1754
|
})
|
|
1751
1755
|
.join(" OR ");
|
|
1752
|
-
const tablesSql = `SELECT "table_schema", "table_name" FROM "information_schema"."tables" WHERE ` +
|
|
1756
|
+
const tablesSql = `SELECT "table_schema", "table_name", obj_description(('"' || "table_schema" || '"."' || "table_name" || '"')::regclass, 'pg_class') AS table_comment FROM "information_schema"."tables" WHERE ` +
|
|
1753
1757
|
tablesCondition;
|
|
1754
1758
|
dbTables.push(...(await this.query(tablesSql)));
|
|
1755
1759
|
}
|
|
@@ -1851,6 +1855,7 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
|
|
|
1851
1855
|
const schema = getSchemaFromKey(dbTable, "table_schema");
|
|
1852
1856
|
table.database = currentDatabase;
|
|
1853
1857
|
table.schema = dbTable["table_schema"];
|
|
1858
|
+
table.comment = dbTable["table_comment"];
|
|
1854
1859
|
table.name = this.driver.buildTableName(dbTable["table_name"], schema);
|
|
1855
1860
|
// create columns from the loaded columns
|
|
1856
1861
|
table.columns = await Promise.all(dbColumns
|
|
@@ -2417,7 +2422,7 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
|
|
|
2417
2422
|
* Builds drop index sql.
|
|
2418
2423
|
*/
|
|
2419
2424
|
dropIndexSql(table, indexOrName) {
|
|
2420
|
-
|
|
2425
|
+
const indexName = InstanceChecker_1.InstanceChecker.isTableIndex(indexOrName)
|
|
2421
2426
|
? indexOrName.name
|
|
2422
2427
|
: indexOrName;
|
|
2423
2428
|
const concurrent = InstanceChecker_1.InstanceChecker.isTableIndex(indexOrName)
|
|
@@ -2689,8 +2694,23 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
|
|
|
2689
2694
|
/**
|
|
2690
2695
|
* Change table comment.
|
|
2691
2696
|
*/
|
|
2692
|
-
changeTableComment(tableOrName,
|
|
2693
|
-
|
|
2697
|
+
async changeTableComment(tableOrName, newComment) {
|
|
2698
|
+
const upQueries = [];
|
|
2699
|
+
const downQueries = [];
|
|
2700
|
+
const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
|
|
2701
|
+
? tableOrName
|
|
2702
|
+
: await this.getCachedTable(tableOrName);
|
|
2703
|
+
newComment = this.escapeComment(newComment);
|
|
2704
|
+
const comment = this.escapeComment(table.comment);
|
|
2705
|
+
if (newComment === comment) {
|
|
2706
|
+
return;
|
|
2707
|
+
}
|
|
2708
|
+
const newTable = table.clone();
|
|
2709
|
+
upQueries.push(new Query_1.Query(`COMMENT ON TABLE ${this.escapePath(newTable)} IS ${newComment}`));
|
|
2710
|
+
downQueries.push(new Query_1.Query(`COMMENT ON TABLE ${this.escapePath(table)} IS ${comment}`));
|
|
2711
|
+
await this.executeQueries(upQueries, downQueries);
|
|
2712
|
+
table.comment = newTable.comment;
|
|
2713
|
+
this.replaceCachedTable(table, newTable);
|
|
2694
2714
|
}
|
|
2695
2715
|
}
|
|
2696
2716
|
exports.PostgresQueryRunner = PostgresQueryRunner;
|