@entity-access/entity-access 1.0.490 → 1.0.492
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/dist/common/CIMap.d.ts +16 -0
- package/dist/common/CIMap.d.ts.map +1 -0
- package/dist/common/CIMap.js +43 -0
- package/dist/common/CIMap.js.map +1 -0
- package/dist/common/IColumnSchema.d.ts +9 -0
- package/dist/common/IColumnSchema.d.ts.map +1 -1
- package/dist/drivers/base/BaseDriver.d.ts +0 -2
- package/dist/drivers/base/BaseDriver.d.ts.map +1 -1
- package/dist/drivers/base/BaseDriver.js.map +1 -1
- package/dist/drivers/base/ExistingSchema.d.ts +14 -0
- package/dist/drivers/base/ExistingSchema.d.ts.map +1 -0
- package/dist/drivers/base/ExistingSchema.js +34 -0
- package/dist/drivers/base/ExistingSchema.js.map +1 -0
- package/dist/drivers/postgres/PostgreSqlDriver.d.ts.map +1 -1
- package/dist/drivers/postgres/PostgreSqlDriver.js +0 -31
- package/dist/drivers/postgres/PostgreSqlDriver.js.map +1 -1
- package/dist/drivers/sql-server/SqlServerDriver.d.ts +0 -2
- package/dist/drivers/sql-server/SqlServerDriver.d.ts.map +1 -1
- package/dist/drivers/sql-server/SqlServerDriver.js +0 -41
- package/dist/drivers/sql-server/SqlServerDriver.js.map +1 -1
- package/dist/migrations/Migrations.d.ts +9 -2
- package/dist/migrations/Migrations.d.ts.map +1 -1
- package/dist/migrations/Migrations.js +54 -6
- package/dist/migrations/Migrations.js.map +1 -1
- package/dist/migrations/postgres/PostgresAutomaticMigrations.d.ts +2 -4
- package/dist/migrations/postgres/PostgresAutomaticMigrations.d.ts.map +1 -1
- package/dist/migrations/postgres/PostgresAutomaticMigrations.js +15 -39
- package/dist/migrations/postgres/PostgresAutomaticMigrations.js.map +1 -1
- package/dist/migrations/postgres/PostgresMigrations.d.ts +3 -0
- package/dist/migrations/postgres/PostgresMigrations.d.ts.map +1 -1
- package/dist/migrations/postgres/PostgresMigrations.js +68 -0
- package/dist/migrations/postgres/PostgresMigrations.js.map +1 -1
- package/dist/migrations/sql-server/SqlServerAutomaticMigrations.d.ts +2 -4
- package/dist/migrations/sql-server/SqlServerAutomaticMigrations.d.ts.map +1 -1
- package/dist/migrations/sql-server/SqlServerAutomaticMigrations.js +22 -45
- package/dist/migrations/sql-server/SqlServerAutomaticMigrations.js.map +1 -1
- package/dist/migrations/sql-server/SqlServerMigrations.d.ts +5 -0
- package/dist/migrations/sql-server/SqlServerMigrations.d.ts.map +1 -1
- package/dist/migrations/sql-server/SqlServerMigrations.js +77 -0
- package/dist/migrations/sql-server/SqlServerMigrations.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/common/CIMap.ts +50 -0
- package/src/common/IColumnSchema.ts +12 -0
- package/src/drivers/base/BaseDriver.ts +1 -3
- package/src/drivers/base/ExistingSchema.ts +60 -0
- package/src/drivers/postgres/PostgreSqlDriver.ts +1 -32
- package/src/drivers/sql-server/SqlServerDriver.ts +1 -42
- package/src/migrations/Migrations.ts +86 -14
- package/src/migrations/postgres/PostgresAutomaticMigrations.ts +22 -54
- package/src/migrations/postgres/PostgresMigrations.ts +78 -0
- package/src/migrations/sql-server/SqlServerAutomaticMigrations.ts +27 -58
- package/src/migrations/sql-server/SqlServerMigrations.ts +86 -0
- package/dist/migrations/ExistingSchema.d.ts +0 -9
- package/dist/migrations/ExistingSchema.d.ts.map +0 -1
- package/dist/migrations/ExistingSchema.js +0 -31
- package/dist/migrations/ExistingSchema.js.map +0 -1
- package/src/migrations/ExistingSchema.ts +0 -39
|
@@ -5,6 +5,7 @@ export default class Migrations {
|
|
|
5
5
|
connection;
|
|
6
6
|
compiler;
|
|
7
7
|
logger;
|
|
8
|
+
schemaCache = new Map();
|
|
8
9
|
constructor(context, connection = context.connection, compiler = context.driver.compiler) {
|
|
9
10
|
this.context = context;
|
|
10
11
|
this.connection = connection;
|
|
@@ -44,11 +45,15 @@ export default class Migrations {
|
|
|
44
45
|
column.default = textQuery.join("").replace(r, "");
|
|
45
46
|
}
|
|
46
47
|
}
|
|
48
|
+
const schema = await this.getSchema(type);
|
|
47
49
|
await this.migrateTable(context, type);
|
|
48
50
|
// create constraints
|
|
49
51
|
for (const iterator of type.checkConstraints) {
|
|
52
|
+
if (schema.constraints.has(iterator.name)) {
|
|
53
|
+
continue;
|
|
54
|
+
}
|
|
50
55
|
const source = context.query(type.typeClass);
|
|
51
|
-
const {
|
|
56
|
+
const { textQuery } = this.compiler.compileToSql(source, `(p) => ${iterator.filter}`);
|
|
52
57
|
const r = new RegExp(source.selectStatement.sourceParameter.name + "\\.", "ig");
|
|
53
58
|
iterator.filter = textQuery.join("").replace(r, "");
|
|
54
59
|
await this.migrateCheckConstraint(context, iterator, type);
|
|
@@ -56,12 +61,12 @@ export default class Migrations {
|
|
|
56
61
|
for (const index of type.indexes) {
|
|
57
62
|
await this.migrateIndexInternal(context, index, type);
|
|
58
63
|
}
|
|
64
|
+
if (createIndexForForeignKeys) {
|
|
65
|
+
postMigration.push(() => this.createIndexForForeignKeys(context, type, type.nonKeys.filter((x) => x.fkRelation
|
|
66
|
+
&& (!x.key || type.keys.indexOf(x) !== 0)
|
|
67
|
+
&& !x.fkRelation?.doNotCreateIndex)));
|
|
68
|
+
}
|
|
59
69
|
for (const { isInverseRelation, foreignKeyConstraint, relatedTypeClass } of type.relations) {
|
|
60
|
-
if (createIndexForForeignKeys) {
|
|
61
|
-
postMigration.push(() => this.createIndexForForeignKeys(context, type, type.nonKeys.filter((x) => x.fkRelation
|
|
62
|
-
&& (!x.key || type.keys.indexOf(x) !== 0)
|
|
63
|
-
&& !x.fkRelation?.doNotCreateIndex)));
|
|
64
|
-
}
|
|
65
70
|
if (isInverseRelation) {
|
|
66
71
|
continue;
|
|
67
72
|
}
|
|
@@ -77,6 +82,9 @@ export default class Migrations {
|
|
|
77
82
|
// for (const iterator of refColumns) {
|
|
78
83
|
// foreignKeyConstraint.refColumns.push(relatedEntity.getProperty(iterator.name).field);
|
|
79
84
|
// }
|
|
85
|
+
if (schema.foreignKeys.has(foreignKeyConstraint.name)) {
|
|
86
|
+
continue;
|
|
87
|
+
}
|
|
80
88
|
postMigration.push(() => this.migrateForeignKey(context, foreignKeyConstraint));
|
|
81
89
|
}
|
|
82
90
|
}
|
|
@@ -114,6 +122,10 @@ export default class Migrations {
|
|
|
114
122
|
async migrateIndexInternal(context, index, type) {
|
|
115
123
|
// parse filter... pending...
|
|
116
124
|
index = { ...index };
|
|
125
|
+
const schema = await this.getSchema(type);
|
|
126
|
+
if (schema.indexes.has(index.name)) {
|
|
127
|
+
return;
|
|
128
|
+
}
|
|
117
129
|
for (const column of index.columns) {
|
|
118
130
|
const c = type.getProperty(column.name);
|
|
119
131
|
if (c.field) {
|
|
@@ -129,6 +141,42 @@ export default class Migrations {
|
|
|
129
141
|
}
|
|
130
142
|
this.migrateIndex(context, index, type);
|
|
131
143
|
}
|
|
144
|
+
async migrateTable(context, type) {
|
|
145
|
+
const schema = await this.getSchema(type);
|
|
146
|
+
// create table if not exists...
|
|
147
|
+
const nonKeyColumns = type.nonKeys;
|
|
148
|
+
const keys = type.keys;
|
|
149
|
+
if (!schema.tables.has(type.name)) {
|
|
150
|
+
await this.createTable(type, keys);
|
|
151
|
+
}
|
|
152
|
+
await this.createColumns(type, nonKeyColumns);
|
|
153
|
+
}
|
|
154
|
+
async createColumns(type, nonKeyColumns) {
|
|
155
|
+
const name = type.schema
|
|
156
|
+
? type.schema + "." + type.name
|
|
157
|
+
: type.name;
|
|
158
|
+
if (nonKeyColumns.length > 1) {
|
|
159
|
+
nonKeyColumns.sort((a, b) => (a.order ?? 0) - (b.order ?? 0));
|
|
160
|
+
}
|
|
161
|
+
const schema = await this.getSchema(type);
|
|
162
|
+
const table = schema.tables.get(type.name);
|
|
163
|
+
for (const iterator of nonKeyColumns) {
|
|
164
|
+
if (table?.has(iterator.columnName)) {
|
|
165
|
+
continue;
|
|
166
|
+
}
|
|
167
|
+
await this.createColumn(type, iterator);
|
|
168
|
+
}
|
|
169
|
+
}
|
|
170
|
+
async getSchema(type) {
|
|
171
|
+
const schema = type.schema || "__ default + __ schema ";
|
|
172
|
+
let s = this.schemaCache.get(schema);
|
|
173
|
+
if (s) {
|
|
174
|
+
return s;
|
|
175
|
+
}
|
|
176
|
+
s = await this.getExistingSchema(type);
|
|
177
|
+
this.schemaCache.set(schema, s);
|
|
178
|
+
return s;
|
|
179
|
+
}
|
|
132
180
|
executeQuery(command, signal) {
|
|
133
181
|
const text = typeof command === "string" ? command : command.text;
|
|
134
182
|
this.logger?.log(text);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Migrations.js","sourceRoot":"","sources":["../../src/migrations/Migrations.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Migrations.js","sourceRoot":"","sources":["../../src/migrations/Migrations.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,16 +2,14 @@ import ICheckConstraint from "../../decorators/ICheckConstraint.js";
|
|
|
2
2
|
import { IColumn } from "../../decorators/IColumn.js";
|
|
3
3
|
import { IForeignKeyConstraint } from "../../decorators/IForeignKeyConstraint.js";
|
|
4
4
|
import { IIndex } from "../../decorators/IIndex.js";
|
|
5
|
-
import { BaseConnection } from "../../drivers/base/BaseDriver.js";
|
|
6
5
|
import EntityType from "../../entity-query/EntityType.js";
|
|
7
6
|
import type EntityContext from "../../model/EntityContext.js";
|
|
8
7
|
import PostgresMigrations from "./PostgresMigrations.js";
|
|
9
8
|
export default class PostgresAutomaticMigrations extends PostgresMigrations {
|
|
10
9
|
ensureVersionTable(context: EntityContext, table: string): Promise<void>;
|
|
11
|
-
migrateTable(context: EntityContext, type: EntityType): Promise<void>;
|
|
12
10
|
createIndexForForeignKeys(context: EntityContext, type: EntityType, fkColumns: IColumn[]): Promise<void>;
|
|
13
|
-
|
|
14
|
-
createTable(
|
|
11
|
+
createColumn(type: EntityType, iterator: IColumn): Promise<void>;
|
|
12
|
+
createTable(type: EntityType, keys: IColumn[]): Promise<void>;
|
|
15
13
|
migrateIndex(context: EntityContext, index: IIndex, type: EntityType): Promise<void>;
|
|
16
14
|
constraintExists(context: EntityContext, name: string, schema: string, table?: string): Promise<boolean>;
|
|
17
15
|
migrateForeignKey(context: EntityContext, constraint: IForeignKeyConstraint): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PostgresAutomaticMigrations.d.ts","sourceRoot":"","sources":["../../../src/migrations/postgres/PostgresAutomaticMigrations.ts"],"names":[],"mappings":"AACA,OAAO,gBAAgB,MAAM,sCAAsC,CAAC;AACpE,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,2CAA2C,CAAC;AAClF,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"PostgresAutomaticMigrations.d.ts","sourceRoot":"","sources":["../../../src/migrations/postgres/PostgresAutomaticMigrations.ts"],"names":[],"mappings":"AACA,OAAO,gBAAgB,MAAM,sCAAsC,CAAC;AACpE,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,2CAA2C,CAAC;AAClF,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AAGpD,OAAO,UAAU,MAAM,kCAAkC,CAAC;AAC1D,OAAO,KAAK,aAAa,MAAM,8BAA8B,CAAC;AAC9D,OAAO,kBAAkB,MAAM,yBAAyB,CAAC;AAEzD,MAAM,CAAC,OAAO,OAAO,2BAA4B,SAAQ,kBAAkB;IAEjE,kBAAkB,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM;IASxD,yBAAyB,CAAC,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE;IAcxF,YAAY,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO;IA4BhD,WAAW,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE;IAqC7C,YAAY,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU;IAoBpE,gBAAgB,CAAC,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,SAA4B;IAqBxG,iBAAiB,CAAC,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,qBAAqB;IAgE3E,sBAAsB,CAAC,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,gBAAgB,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,UAAU;CAwB3G"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { __addDisposableResource, __disposeResources } from "tslib";
|
|
2
|
-
import ExistingSchema from "../ExistingSchema.js";
|
|
3
2
|
import PostgresMigrations from "./PostgresMigrations.js";
|
|
4
3
|
export default class PostgresAutomaticMigrations extends PostgresMigrations {
|
|
5
4
|
async ensureVersionTable(context, table) {
|
|
@@ -10,14 +9,6 @@ export default class PostgresAutomaticMigrations extends PostgresMigrations {
|
|
|
10
9
|
constraint PK_MigrationTable_Version PRIMARY KEY ("name","version")
|
|
11
10
|
)`);
|
|
12
11
|
}
|
|
13
|
-
async migrateTable(context, type) {
|
|
14
|
-
// create table if not exists...
|
|
15
|
-
const nonKeyColumns = type.nonKeys;
|
|
16
|
-
const keys = type.keys;
|
|
17
|
-
const driver = context.connection;
|
|
18
|
-
await this.createTable(driver, type, keys);
|
|
19
|
-
await this.createColumns(driver, type, nonKeyColumns);
|
|
20
|
-
}
|
|
21
12
|
async createIndexForForeignKeys(context, type, fkColumns) {
|
|
22
13
|
for (const iterator of fkColumns) {
|
|
23
14
|
const filter = iterator.nullable
|
|
@@ -28,42 +19,28 @@ export default class PostgresAutomaticMigrations extends PostgresMigrations {
|
|
|
28
19
|
columns: [{ name: iterator.columnName, descending: iterator.indexOrder !== "ascending" }],
|
|
29
20
|
filter
|
|
30
21
|
};
|
|
31
|
-
await this.
|
|
22
|
+
await this.migrateIndexInternal(context, indexDef, type);
|
|
32
23
|
}
|
|
33
24
|
}
|
|
34
|
-
async
|
|
25
|
+
async createColumn(type, iterator) {
|
|
35
26
|
const name = type.schema
|
|
36
27
|
? type.schema + "." + type.name
|
|
37
28
|
: type.name;
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
for (const iterator of nonKeyColumns) {
|
|
44
|
-
const { columnName } = iterator;
|
|
45
|
-
if (columnSet.has(columnName)) {
|
|
46
|
-
continue;
|
|
47
|
-
}
|
|
48
|
-
let def = `ALTER TABLE ${name} ADD COLUMN IF NOT EXISTS ${columnName} `;
|
|
49
|
-
def += this.getColumnDefinition(iterator);
|
|
50
|
-
if (iterator.nullable !== true) {
|
|
51
|
-
def += " NOT NULL ";
|
|
52
|
-
}
|
|
53
|
-
if (iterator.generated === "computed") {
|
|
54
|
-
def += ` GENERATED ALWAYS AS (${iterator.computed}) ${iterator.stored ? "STORED" : ""} \r\n\t`;
|
|
55
|
-
}
|
|
56
|
-
if (typeof iterator.default === "string") {
|
|
57
|
-
def += " DEFAULT " + iterator.default;
|
|
58
|
-
}
|
|
59
|
-
await this.executeQuery(def + ";");
|
|
29
|
+
const { quotedColumnName } = iterator;
|
|
30
|
+
let def = `ALTER TABLE ${name} ADD COLUMN IF NOT EXISTS ${quotedColumnName} `;
|
|
31
|
+
def += this.getColumnDefinition(iterator);
|
|
32
|
+
if (iterator.nullable !== true) {
|
|
33
|
+
def += " NOT NULL ";
|
|
60
34
|
}
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
if (
|
|
65
|
-
|
|
35
|
+
if (iterator.generated === "computed") {
|
|
36
|
+
def += ` GENERATED ALWAYS AS (${iterator.computed}) ${iterator.stored ? "STORED" : ""} \r\n\t`;
|
|
37
|
+
}
|
|
38
|
+
if (typeof iterator.default === "string") {
|
|
39
|
+
def += " DEFAULT " + iterator.default;
|
|
66
40
|
}
|
|
41
|
+
await this.executeQuery(def + ";");
|
|
42
|
+
}
|
|
43
|
+
async createTable(type, keys) {
|
|
67
44
|
const name = type.schema
|
|
68
45
|
? type.schema + "." + type.name
|
|
69
46
|
: type.name;
|
|
@@ -95,7 +72,6 @@ export default class PostgresAutomaticMigrations extends PostgresMigrations {
|
|
|
95
72
|
)`);
|
|
96
73
|
}
|
|
97
74
|
async migrateIndex(context, index, type) {
|
|
98
|
-
const driver = context.connection;
|
|
99
75
|
const name = type.schema
|
|
100
76
|
? type.schema + "." + type.name
|
|
101
77
|
: type.name;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PostgresAutomaticMigrations.js","sourceRoot":"","sources":["../../../src/migrations/postgres/PostgresAutomaticMigrations.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"PostgresAutomaticMigrations.js","sourceRoot":"","sources":["../../../src/migrations/postgres/PostgresAutomaticMigrations.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
import { IColumn } from "../../decorators/IColumn.js";
|
|
2
|
+
import ExistingSchema from "../../drivers/base/ExistingSchema.js";
|
|
3
|
+
import EntityType from "../../entity-query/EntityType.js";
|
|
2
4
|
import Migrations from "../Migrations.js";
|
|
3
5
|
export default abstract class PostgresMigrations extends Migrations {
|
|
6
|
+
getExistingSchema(type: EntityType): Promise<ExistingSchema>;
|
|
4
7
|
protected getColumnDefinition(iterator: IColumn): string;
|
|
5
8
|
protected getColumnType(iterator: IColumn): "bigint" | "text" | "varchar" | "timestamp" | "timestamp with time zone" | "float8" | "real" | "integer" | "boolean" | "bytea" | "decimal" | "json" | "jsonb" | "uuid" | "geometry";
|
|
6
9
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PostgresMigrations.d.ts","sourceRoot":"","sources":["../../../src/migrations/postgres/PostgresMigrations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,UAAU,MAAM,kBAAkB,CAAC;AAE1C,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,kBAAmB,SAAQ,UAAU;
|
|
1
|
+
{"version":3,"file":"PostgresMigrations.d.ts","sourceRoot":"","sources":["../../../src/migrations/postgres/PostgresMigrations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,cAAc,MAAM,sCAAsC,CAAC;AAClE,OAAO,UAAU,MAAM,kCAAkC,CAAC;AAC1D,OAAO,UAAU,MAAM,kBAAkB,CAAC;AAE1C,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,kBAAmB,SAAQ,UAAU;IAEzD,iBAAiB,CAAC,IAAI,EAAE,UAAU;IA4ExC,SAAS,CAAC,mBAAmB,CAAC,QAAQ,EAAE,OAAO;IAc/C,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE,OAAO;CAsC5C"}
|
|
@@ -1,5 +1,73 @@
|
|
|
1
|
+
import ExistingSchema from "../../drivers/base/ExistingSchema.js";
|
|
1
2
|
import Migrations from "../Migrations.js";
|
|
2
3
|
export default class PostgresMigrations extends Migrations {
|
|
4
|
+
async getExistingSchema(type) {
|
|
5
|
+
const schema = type.schema || "public";
|
|
6
|
+
const values = [schema];
|
|
7
|
+
let text = `
|
|
8
|
+
select
|
|
9
|
+
column_name as "name",
|
|
10
|
+
case data_type
|
|
11
|
+
when 'bigint' then 'BigInt'
|
|
12
|
+
when 'boolean' then 'Boolean'
|
|
13
|
+
when 'timestamp' then 'DateTime'
|
|
14
|
+
when 'timestamp with time zone' then 'DateTime'
|
|
15
|
+
when 'timestamp without time zone' then 'DateTime'
|
|
16
|
+
when 'integer' then 'Int'
|
|
17
|
+
when 'real' then 'Double'
|
|
18
|
+
when 'numeric' then 'Decimal'
|
|
19
|
+
else 'Char' end as "dataType",
|
|
20
|
+
case
|
|
21
|
+
when is_nullable = 'YES' then true
|
|
22
|
+
else false end as "nullable",
|
|
23
|
+
character_maximum_length as "length",
|
|
24
|
+
case
|
|
25
|
+
when is_identity = 'YES' then 'identity'
|
|
26
|
+
else null end as "identity",
|
|
27
|
+
case
|
|
28
|
+
when is_generated = 'YES' then '() => 1'
|
|
29
|
+
else null end as "computed",
|
|
30
|
+
table_name as "ownerName",
|
|
31
|
+
'table' as "ownerType"
|
|
32
|
+
from information_schema.columns
|
|
33
|
+
where table_schema = $1`;
|
|
34
|
+
let r = await this.executeQuery({ text, values });
|
|
35
|
+
const columns = r.rows;
|
|
36
|
+
text = `
|
|
37
|
+
SELECT
|
|
38
|
+
tc.constraint_name as "name"
|
|
39
|
+
FROM information_schema.table_constraints AS tc
|
|
40
|
+
JOIN information_schema.key_column_usage AS kcu
|
|
41
|
+
ON tc.constraint_name = kcu.constraint_name
|
|
42
|
+
AND tc.table_schema = kcu.table_schema
|
|
43
|
+
JOIN information_schema.constraint_column_usage AS ccu
|
|
44
|
+
ON ccu.constraint_name = tc.constraint_name
|
|
45
|
+
WHERE
|
|
46
|
+
tc.constraint_type = 'FOREIGN KEY'
|
|
47
|
+
AND tc.table_schema = $1
|
|
48
|
+
`;
|
|
49
|
+
r = await this.executeQuery({ text, values });
|
|
50
|
+
const foreignKeys = r.rows;
|
|
51
|
+
text = `
|
|
52
|
+
SELECT indexname as "name" FROM pg_indexes where schemaName=$1`;
|
|
53
|
+
r = await this.executeQuery({ text, values });
|
|
54
|
+
const indexes = r.rows;
|
|
55
|
+
text = `
|
|
56
|
+
SELECT
|
|
57
|
+
tc.constraint_name as "name"
|
|
58
|
+
FROM information_schema.table_constraints AS tc
|
|
59
|
+
JOIN information_schema.key_column_usage AS kcu
|
|
60
|
+
ON tc.constraint_name = kcu.constraint_name
|
|
61
|
+
AND tc.table_schema = kcu.table_schema
|
|
62
|
+
JOIN information_schema.constraint_column_usage AS ccu
|
|
63
|
+
ON ccu.constraint_name = tc.constraint_name
|
|
64
|
+
WHERE
|
|
65
|
+
tc.constraint_type <> 'FOREIGN KEY'
|
|
66
|
+
AND tc.table_schema = $1`;
|
|
67
|
+
r = await this.executeQuery({ text, values });
|
|
68
|
+
const constraints = r.rows;
|
|
69
|
+
return new ExistingSchema(false, { columns, foreignKeys, indexes, constraints });
|
|
70
|
+
}
|
|
3
71
|
getColumnDefinition(iterator) {
|
|
4
72
|
if (iterator.dataType === "Decimal") {
|
|
5
73
|
if (iterator.precision && iterator.scale) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PostgresMigrations.js","sourceRoot":"","sources":["../../../src/migrations/postgres/PostgresMigrations.ts"],"names":[],"mappings":"AACA,OAAO,UAAU,MAAM,kBAAkB,CAAC;AAE1C,MAAM,CAAC,OAAO,OAAgB,kBAAmB,SAAQ,UAAU;
|
|
1
|
+
{"version":3,"file":"PostgresMigrations.js","sourceRoot":"","sources":["../../../src/migrations/postgres/PostgresMigrations.ts"],"names":[],"mappings":"AACA,OAAO,cAAc,MAAM,sCAAsC,CAAC;AAElE,OAAO,UAAU,MAAM,kBAAkB,CAAC;AAE1C,MAAM,CAAC,OAAO,OAAgB,kBAAmB,SAAQ,UAAU;IAE/D,KAAK,CAAC,iBAAiB,CAAC,IAAgB;QAEpC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,QAAQ,CAAC;QACvC,MAAM,MAAM,GAAG,CAAC,MAAM,CAAC,CAAC;QAExB,IAAI,IAAI,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;oCA0BiB,CAAC;QAE7B,IAAI,CAAC,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,MAAM,EAAC,CAAC,CAAC;QACjD,MAAM,OAAO,GAAI,CAAC,CAAC,IAAI,CAAC;QAExB,IAAI,GAAG;;;;;;;;;;;;SAYN,CAAC;QACF,CAAC,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,MAAM,EAAC,CAAC,CAAC;QAC7C,MAAM,WAAW,GAAG,CAAC,CAAC,IAAI,CAAC;QAE3B,IAAI,GAAG;uEACwD,CAAC;QAChE,CAAC,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;QAC9C,MAAM,OAAO,GAAG,CAAC,CAAC,IAAI,CAAC;QAEvB,IAAI,GAAG;;;;;;;;;;;yCAW0B,CAAC;QAElC,CAAC,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;QAC9C,MAAM,WAAW,GAAG,CAAC,CAAC,IAAI,CAAC;QAE3B,OAAO,IAAI,cAAc,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC;IACrF,CAAC;IAES,mBAAmB,CAAC,QAAiB;QAC3C,IAAI,QAAQ,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;YAClC,IAAI,QAAQ,CAAC,SAAS,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;gBACvC,OAAO,YAAY,QAAQ,CAAC,SAAS,KAAK,QAAQ,CAAC,KAAK,GAAG,CAAC;YAChE,CAAC;YACD,OAAO,gBAAgB,CAAC;QAC5B,CAAC;QACD,MAAM,IAAI,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QAC1C,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;YAClB,OAAO,GAAG,IAAI,KAAK,QAAQ,CAAC,MAAM,GAAG,CAAC;QAC1C,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAES,aAAa,CAAC,QAAiB;QACrC,QAAO,QAAQ,CAAC,QAAQ,EAAE,CAAC;YACvB,KAAK,QAAQ;gBACT,OAAO,QAAQ,CAAC;YACpB,KAAK,WAAW,CAAC;YACjB,KAAK,MAAM;gBACP,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;oBACnB,OAAO,MAAM,CAAC;gBAClB,CAAC;gBACD,OAAO,SAAS,CAAC;YACrB,KAAK,UAAU;gBACX,OAAO,WAAW,CAAC;YACvB,KAAK,gBAAgB;gBACjB,OAAO,0BAA0B,CAAC;YACtC,KAAK,QAAQ;gBACT,OAAO,QAAQ,CAAC;YACpB,KAAK,OAAO;gBACR,OAAO,MAAM,CAAC;YAClB,KAAK,KAAK;gBACN,OAAO,SAAS,CAAC;YACrB,KAAK,SAAS;gBACV,OAAO,SAAS,CAAC;YACrB,KAAK,WAAW;gBACZ,OAAO,OAAO,CAAC;YACnB,KAAK,SAAS;gBACV,OAAO,SAAS,CAAC;YACrB,KAAK,MAAM;gBACP,OAAO,MAAM,CAAC;YAClB,KAAK,OAAO;gBACR,OAAO,OAAO,CAAC;YACnB,KAAK,MAAM;gBACP,OAAO,MAAM,CAAC;YAClB,KAAK,UAAU;gBACX,OAAO,UAAU,CAAC;QAC1B,CAAC;QACD,MAAM,CAAC,GAAU,QAAQ,CAAC,QAAQ,CAAC;QACnC,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC;IACnC,CAAC;CACJ"}
|
|
@@ -2,16 +2,14 @@ import ICheckConstraint from "../../decorators/ICheckConstraint.js";
|
|
|
2
2
|
import { IColumn } from "../../decorators/IColumn.js";
|
|
3
3
|
import { IForeignKeyConstraint } from "../../decorators/IForeignKeyConstraint.js";
|
|
4
4
|
import { IIndex } from "../../decorators/IIndex.js";
|
|
5
|
-
import { BaseConnection } from "../../drivers/base/BaseDriver.js";
|
|
6
5
|
import EntityType from "../../entity-query/EntityType.js";
|
|
7
6
|
import type EntityContext from "../../model/EntityContext.js";
|
|
8
7
|
import SqlServerMigrations from "./SqlServerMigrations.js";
|
|
9
8
|
export default class SqlServerAutomaticMigrations extends SqlServerMigrations {
|
|
10
9
|
ensureVersionTable(context: EntityContext, table: string): Promise<void>;
|
|
11
|
-
migrateTable(context: EntityContext, type: EntityType): Promise<void>;
|
|
12
10
|
createIndexForForeignKeys(context: EntityContext, type: EntityType, fkColumns: IColumn[]): Promise<void>;
|
|
13
|
-
|
|
14
|
-
createTable(
|
|
11
|
+
createColumn(type: EntityType, iterator: IColumn): Promise<void>;
|
|
12
|
+
createTable(type: EntityType, keys: IColumn[]): Promise<void>;
|
|
15
13
|
migrateIndex(context: EntityContext, index: IIndex, type: EntityType): Promise<void>;
|
|
16
14
|
constraintExists(context: EntityContext, name: string, schema: string, type: EntityType): Promise<boolean>;
|
|
17
15
|
migrateForeignKey(context: EntityContext, constraint: IForeignKeyConstraint): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SqlServerAutomaticMigrations.d.ts","sourceRoot":"","sources":["../../../src/migrations/sql-server/SqlServerAutomaticMigrations.ts"],"names":[],"mappings":"AACA,OAAO,gBAAgB,MAAM,sCAAsC,CAAC;AACpE,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,2CAA2C,CAAC;AAClF,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"SqlServerAutomaticMigrations.d.ts","sourceRoot":"","sources":["../../../src/migrations/sql-server/SqlServerAutomaticMigrations.ts"],"names":[],"mappings":"AACA,OAAO,gBAAgB,MAAM,sCAAsC,CAAC;AACpE,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,2CAA2C,CAAC;AAClF,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AAIpD,OAAO,UAAU,MAAM,kCAAkC,CAAC;AAC1D,OAAO,KAAK,aAAa,MAAM,8BAA8B,CAAC;AAC9D,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAE3D,MAAM,CAAC,OAAO,OAAO,4BAA6B,SAAQ,mBAAmB;IAEnE,kBAAkB,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM;IAYxD,yBAAyB,CAAC,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE;IAcxF,YAAY,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO;IAgChD,WAAW,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE;IAmC7C,YAAY,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU;IAsBpE,gBAAgB,CAAC,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU;IAqBvF,iBAAiB,CAAC,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,qBAAqB;IAkD3E,sBAAsB,CAAC,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,gBAAgB,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,UAAU;CAuB3G"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { SqlServerLiteral } from "../../drivers/sql-server/SqlServerLiteral.js";
|
|
2
|
-
import ExistingSchema from "../ExistingSchema.js";
|
|
3
2
|
import SqlServerMigrations from "./SqlServerMigrations.js";
|
|
4
3
|
export default class SqlServerAutomaticMigrations extends SqlServerMigrations {
|
|
5
4
|
async ensureVersionTable(context, table) {
|
|
@@ -12,14 +11,6 @@ export default class SqlServerAutomaticMigrations extends SqlServerMigrations {
|
|
|
12
11
|
)
|
|
13
12
|
END`);
|
|
14
13
|
}
|
|
15
|
-
async migrateTable(context, type) {
|
|
16
|
-
// create table if not exists...
|
|
17
|
-
const nonKeyColumns = type.nonKeys;
|
|
18
|
-
const keys = type.keys;
|
|
19
|
-
const driver = context.connection;
|
|
20
|
-
await this.createTable(driver, type, keys);
|
|
21
|
-
await this.createColumns(driver, type, nonKeyColumns);
|
|
22
|
-
}
|
|
23
14
|
async createIndexForForeignKeys(context, type, fkColumns) {
|
|
24
15
|
for (const iterator of fkColumns) {
|
|
25
16
|
const filter = iterator.nullable
|
|
@@ -30,50 +21,36 @@ export default class SqlServerAutomaticMigrations extends SqlServerMigrations {
|
|
|
30
21
|
columns: [{ name: iterator.quotedColumnName, descending: iterator.indexOrder !== "ascending" }],
|
|
31
22
|
filter
|
|
32
23
|
};
|
|
33
|
-
await this.
|
|
24
|
+
await this.migrateIndexInternal(context, indexDef, type);
|
|
34
25
|
}
|
|
35
26
|
}
|
|
36
|
-
async
|
|
27
|
+
async createColumn(type, iterator) {
|
|
28
|
+
const { quotedColumnName } = iterator;
|
|
37
29
|
const name = type.schema
|
|
38
30
|
? type.schema + "." + type.name
|
|
39
31
|
: type.name;
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
const columns = await ExistingSchema.getSchema(driver, type.schema || "dbo", type.name);
|
|
44
|
-
const columnSet = new Set(columns.map((x) => x.name.toLowerCase()));
|
|
45
|
-
for (const iterator of nonKeyColumns) {
|
|
46
|
-
const { quotedColumnName, columnName } = iterator;
|
|
47
|
-
if (columnSet.has(columnName.toLowerCase())) {
|
|
48
|
-
continue;
|
|
49
|
-
}
|
|
50
|
-
let def = `ALTER TABLE ${name} ADD ${quotedColumnName} `;
|
|
51
|
-
if (iterator.computed) {
|
|
52
|
-
def += ` AS ${iterator.computed} ${iterator.stored ? "PERSISTED" : ""}`;
|
|
53
|
-
await this.executeQuery(def + ";");
|
|
54
|
-
continue;
|
|
55
|
-
}
|
|
56
|
-
def += this.getColumnDefinition(iterator);
|
|
57
|
-
if (iterator.nullable === true) {
|
|
58
|
-
def += " NULL ";
|
|
59
|
-
}
|
|
60
|
-
else {
|
|
61
|
-
def += " NOT NULL ";
|
|
62
|
-
}
|
|
63
|
-
if (iterator.computed) {
|
|
64
|
-
def += ` AS ${iterator.computed} ${iterator.stored ? "PERSISTED" : ""}`;
|
|
65
|
-
}
|
|
66
|
-
if (typeof iterator.default === "string") {
|
|
67
|
-
def += " DEFAULT " + iterator.default;
|
|
68
|
-
}
|
|
32
|
+
let def = `ALTER TABLE ${name} ADD ${quotedColumnName} `;
|
|
33
|
+
if (iterator.computed) {
|
|
34
|
+
def += ` AS ${iterator.computed} ${iterator.stored ? "PERSISTED" : ""}`;
|
|
69
35
|
await this.executeQuery(def + ";");
|
|
70
|
-
}
|
|
71
|
-
}
|
|
72
|
-
async createTable(driver, type, keys) {
|
|
73
|
-
const columns = await ExistingSchema.getSchema(driver, type.schema || "public", type.name);
|
|
74
|
-
if (columns.length) {
|
|
75
36
|
return;
|
|
76
37
|
}
|
|
38
|
+
def += this.getColumnDefinition(iterator);
|
|
39
|
+
if (iterator.nullable === true) {
|
|
40
|
+
def += " NULL ";
|
|
41
|
+
}
|
|
42
|
+
else {
|
|
43
|
+
def += " NOT NULL ";
|
|
44
|
+
}
|
|
45
|
+
if (iterator.computed) {
|
|
46
|
+
def += ` AS ${iterator.computed} ${iterator.stored ? "PERSISTED" : ""}`;
|
|
47
|
+
}
|
|
48
|
+
if (typeof iterator.default === "string") {
|
|
49
|
+
def += " DEFAULT " + iterator.default;
|
|
50
|
+
}
|
|
51
|
+
await this.executeQuery(def + ";");
|
|
52
|
+
}
|
|
53
|
+
async createTable(type, keys) {
|
|
77
54
|
const name = type.schema
|
|
78
55
|
? type.schema + "." + type.name
|
|
79
56
|
: type.name;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SqlServerAutomaticMigrations.js","sourceRoot":"","sources":["../../../src/migrations/sql-server/SqlServerAutomaticMigrations.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"SqlServerAutomaticMigrations.js","sourceRoot":"","sources":["../../../src/migrations/sql-server/SqlServerAutomaticMigrations.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,11 @@
|
|
|
1
|
+
import CIMap from "../../common/CIMap.js";
|
|
1
2
|
import { IColumn } from "../../decorators/IColumn.js";
|
|
3
|
+
import ExistingSchema from "../../drivers/base/ExistingSchema.js";
|
|
4
|
+
import EntityType from "../../entity-query/EntityType.js";
|
|
2
5
|
import Migrations from "../Migrations.js";
|
|
3
6
|
export default abstract class SqlServerMigrations extends Migrations {
|
|
7
|
+
protected schemaCache: CIMap<ExistingSchema>;
|
|
8
|
+
getExistingSchema(type: EntityType): Promise<ExistingSchema>;
|
|
4
9
|
protected getColumnDefinition(iterator: IColumn): string;
|
|
5
10
|
protected getColumnType(iterator: IColumn): "DateTimeOffset" | "bigint" | "varchar" | "real" | "decimal" | "json" | "jsonb" | "geometry" | "varchar(max)" | "nvarchar(max)" | "nvarchar" | "DateTime2" | "float" | "int" | "bit" | "varbinary" | "UniqueIdentifier";
|
|
6
11
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SqlServerMigrations.d.ts","sourceRoot":"","sources":["../../../src/migrations/sql-server/SqlServerMigrations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,UAAU,MAAM,kBAAkB,CAAC;AAE1C,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,mBAAoB,SAAQ,UAAU;IAEhE,SAAS,CAAC,mBAAmB,CAAC,QAAQ,EAAE,OAAO;IAc/C,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE,OAAO;CA0C5C"}
|
|
1
|
+
{"version":3,"file":"SqlServerMigrations.d.ts","sourceRoot":"","sources":["../../../src/migrations/sql-server/SqlServerMigrations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,uBAAuB,CAAC;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,cAAc,MAAM,sCAAsC,CAAC;AAClE,OAAO,UAAU,MAAM,kCAAkC,CAAC;AAC1D,OAAO,UAAU,MAAM,kBAAkB,CAAC;AAE1C,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,mBAAoB,SAAQ,UAAU;IAEhE,SAAS,CAAC,WAAW,wBAA+B;IAE9C,iBAAiB,CAAC,IAAI,EAAE,UAAU;IAiFxC,SAAS,CAAC,mBAAmB,CAAC,QAAQ,EAAE,OAAO;IAc/C,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE,OAAO;CA0C5C"}
|