@entity-access/entity-access 1.0.488 → 1.0.490

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.
Files changed (41) hide show
  1. package/dist/common/IColumnSchema.d.ts +2 -0
  2. package/dist/common/IColumnSchema.d.ts.map +1 -1
  3. package/dist/drivers/base/BaseDriver.d.ts +3 -2
  4. package/dist/drivers/base/BaseDriver.d.ts.map +1 -1
  5. package/dist/drivers/base/BaseDriver.js.map +1 -1
  6. package/dist/drivers/postgres/PostgreSqlDriver.d.ts.map +1 -1
  7. package/dist/drivers/postgres/PostgreSqlDriver.js +8 -7
  8. package/dist/drivers/postgres/PostgreSqlDriver.js.map +1 -1
  9. package/dist/drivers/sql-server/SqlServerDriver.d.ts +3 -2
  10. package/dist/drivers/sql-server/SqlServerDriver.d.ts.map +1 -1
  11. package/dist/drivers/sql-server/SqlServerDriver.js +7 -6
  12. package/dist/drivers/sql-server/SqlServerDriver.js.map +1 -1
  13. package/dist/migrations/ExistingSchema.d.ts +9 -0
  14. package/dist/migrations/ExistingSchema.d.ts.map +1 -0
  15. package/dist/migrations/ExistingSchema.js +31 -0
  16. package/dist/migrations/ExistingSchema.js.map +1 -0
  17. package/dist/migrations/Migrations.d.ts +9 -2
  18. package/dist/migrations/Migrations.d.ts.map +1 -1
  19. package/dist/migrations/Migrations.js +16 -2
  20. package/dist/migrations/Migrations.js.map +1 -1
  21. package/dist/migrations/postgres/PostgresAutomaticMigrations.d.ts +1 -1
  22. package/dist/migrations/postgres/PostgresAutomaticMigrations.d.ts.map +1 -1
  23. package/dist/migrations/postgres/PostgresAutomaticMigrations.js +13 -8
  24. package/dist/migrations/postgres/PostgresAutomaticMigrations.js.map +1 -1
  25. package/dist/migrations/sql-server/SqlServerAutomaticMigrations.d.ts +1 -1
  26. package/dist/migrations/sql-server/SqlServerAutomaticMigrations.d.ts.map +1 -1
  27. package/dist/migrations/sql-server/SqlServerAutomaticMigrations.js +13 -8
  28. package/dist/migrations/sql-server/SqlServerAutomaticMigrations.js.map +1 -1
  29. package/dist/tsconfig.tsbuildinfo +1 -1
  30. package/dist/workflows/WorkflowStorage.js +1 -1
  31. package/dist/workflows/WorkflowStorage.js.map +1 -1
  32. package/package.json +1 -1
  33. package/src/common/IColumnSchema.ts +2 -0
  34. package/src/drivers/base/BaseDriver.ts +3 -2
  35. package/src/drivers/postgres/PostgreSqlDriver.ts +9 -7
  36. package/src/drivers/sql-server/SqlServerDriver.ts +8 -6
  37. package/src/migrations/ExistingSchema.ts +39 -0
  38. package/src/migrations/Migrations.ts +25 -4
  39. package/src/migrations/postgres/PostgresAutomaticMigrations.ts +16 -10
  40. package/src/migrations/sql-server/SqlServerAutomaticMigrations.ts +17 -11
  41. package/src/workflows/WorkflowStorage.ts +1 -1
@@ -1 +1 @@
1
- {"version":3,"file":"PostgresAutomaticMigrations.js","sourceRoot":"","sources":["../../../src/migrations/postgres/PostgresAutomaticMigrations.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"PostgresAutomaticMigrations.js","sourceRoot":"","sources":["../../../src/migrations/postgres/PostgresAutomaticMigrations.ts"],"names":[],"mappings":"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"}
@@ -4,7 +4,7 @@ import { IForeignKeyConstraint } from "../../decorators/IForeignKeyConstraint.js
4
4
  import { IIndex } from "../../decorators/IIndex.js";
5
5
  import { BaseConnection } from "../../drivers/base/BaseDriver.js";
6
6
  import EntityType from "../../entity-query/EntityType.js";
7
- import EntityContext from "../../model/EntityContext.js";
7
+ import type EntityContext from "../../model/EntityContext.js";
8
8
  import SqlServerMigrations from "./SqlServerMigrations.js";
9
9
  export default class SqlServerAutomaticMigrations extends SqlServerMigrations {
10
10
  ensureVersionTable(context: EntityContext, table: string): 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;AACpD,OAAO,EAAE,cAAc,EAAc,MAAM,kCAAkC,CAAC;AAE9E,OAAO,UAAU,MAAM,kCAAkC,CAAC;AAC1D,OAAO,aAAa,MAAM,8BAA8B,CAAC;AAEzD,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAE3D,MAAM,CAAC,OAAO,OAAO,4BAA6B,SAAQ,mBAAmB;IAEnE,kBAAkB,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM;IAWxD,YAAY,CAAC,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,UAAU;IAerD,yBAAyB,CAAC,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE;IAcxF,aAAa,CAAC,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,UAAU,EAAE,aAAa,EAAE,OAAO,EAAE;IA4ChF,WAAW,CAAC,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE;IAmCrE,YAAY,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU;IAqBpE,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
+ {"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;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAElE,OAAO,UAAU,MAAM,kCAAkC,CAAC;AAC1D,OAAO,KAAK,aAAa,MAAM,8BAA8B,CAAC;AAE9D,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAE3D,MAAM,CAAC,OAAO,OAAO,4BAA6B,SAAQ,mBAAmB;IAEnE,kBAAkB,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM;IAWxD,YAAY,CAAC,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,UAAU;IAerD,yBAAyB,CAAC,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE;IAcxF,aAAa,CAAC,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,UAAU,EAAE,aAAa,EAAE,OAAO,EAAE;IA4ChF,WAAW,CAAC,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE;IAyCrE,YAAY,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU;IAqBpE,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,4 +1,5 @@
1
1
  import { SqlServerLiteral } from "../../drivers/sql-server/SqlServerLiteral.js";
2
+ import ExistingSchema from "../ExistingSchema.js";
2
3
  import SqlServerMigrations from "./SqlServerMigrations.js";
3
4
  export default class SqlServerAutomaticMigrations extends SqlServerMigrations {
4
5
  async ensureVersionTable(context, table) {
@@ -39,7 +40,7 @@ export default class SqlServerAutomaticMigrations extends SqlServerMigrations {
39
40
  if (nonKeyColumns.length > 1) {
40
41
  nonKeyColumns.sort((a, b) => (a.order ?? 0) - (b.order ?? 0));
41
42
  }
42
- const columns = await driver.getColumnSchema(type.schema || "dbo", type.name);
43
+ const columns = await ExistingSchema.getSchema(driver, type.schema || "dbo", type.name);
43
44
  const columnSet = new Set(columns.map((x) => x.name.toLowerCase()));
44
45
  for (const iterator of nonKeyColumns) {
45
46
  const { quotedColumnName, columnName } = iterator;
@@ -49,7 +50,7 @@ export default class SqlServerAutomaticMigrations extends SqlServerMigrations {
49
50
  let def = `ALTER TABLE ${name} ADD ${quotedColumnName} `;
50
51
  if (iterator.computed) {
51
52
  def += ` AS ${iterator.computed} ${iterator.stored ? "PERSISTED" : ""}`;
52
- await driver.executeQuery(def + ";");
53
+ await this.executeQuery(def + ";");
53
54
  continue;
54
55
  }
55
56
  def += this.getColumnDefinition(iterator);
@@ -65,10 +66,14 @@ export default class SqlServerAutomaticMigrations extends SqlServerMigrations {
65
66
  if (typeof iterator.default === "string") {
66
67
  def += " DEFAULT " + iterator.default;
67
68
  }
68
- await driver.executeQuery(def + ";");
69
+ await this.executeQuery(def + ";");
69
70
  }
70
71
  }
71
72
  async createTable(driver, type, keys) {
73
+ const columns = await ExistingSchema.getSchema(driver, type.schema || "public", type.name);
74
+ if (columns.length) {
75
+ return;
76
+ }
72
77
  const name = type.schema
73
78
  ? type.schema + "." + type.name
74
79
  : type.name;
@@ -91,7 +96,7 @@ export default class SqlServerAutomaticMigrations extends SqlServerMigrations {
91
96
  // def += " NOT NULL\r\n\t";
92
97
  fields.push(def);
93
98
  }
94
- await driver.executeQuery(`IF OBJECT_ID(${SqlServerLiteral.escapeLiteral(name)}) IS NULL BEGIN
99
+ await this.executeQuery(`IF OBJECT_ID(${SqlServerLiteral.escapeLiteral(name)}) IS NULL BEGIN
95
100
  CREATE TABLE ${name} (${fields.join(",")}
96
101
  , CONSTRAINT PK_${name} PRIMARY KEY(${keys.map((x) => x.quotedColumnName)})
97
102
  );
@@ -115,7 +120,7 @@ export default class SqlServerAutomaticMigrations extends SqlServerMigrations {
115
120
  query += ` WHERE (${index.filter})`;
116
121
  }
117
122
  query += `\nEND`;
118
- await driver.executeQuery(query);
123
+ await this.executeQuery(query);
119
124
  }
120
125
  async constraintExists(context, name, schema, type) {
121
126
  let text = `SELECT COUNT(*) as c1
@@ -126,7 +131,7 @@ export default class SqlServerAutomaticMigrations extends SqlServerMigrations {
126
131
  text += ` and schema_name = ${schema}`;
127
132
  }
128
133
  const driver = context.connection;
129
- const r = await driver.executeQuery(text);
134
+ const r = await this.executeQuery(text);
130
135
  if (r.rows?.length === 0) {
131
136
  if (r.rows["c1"] > 0) {
132
137
  return true;
@@ -168,7 +173,7 @@ export default class SqlServerAutomaticMigrations extends SqlServerMigrations {
168
173
  break;
169
174
  }
170
175
  try {
171
- await driver.executeQuery(text);
176
+ await this.executeQuery(text);
172
177
  }
173
178
  catch (error) {
174
179
  // we will simply ignore this
@@ -186,7 +191,7 @@ export default class SqlServerAutomaticMigrations extends SqlServerMigrations {
186
191
  const driver = context.connection;
187
192
  const text = `ALTER TABLE ${name} ADD CONSTRAINT ${constraint.name} CHECK (${constraint.filter})`;
188
193
  try {
189
- await driver.executeQuery(text);
194
+ await this.executeQuery(text);
190
195
  }
191
196
  catch (error) {
192
197
  // we will simply ignore this
@@ -1 +1 @@
1
- {"version":3,"file":"SqlServerAutomaticMigrations.js","sourceRoot":"","sources":["../../../src/migrations/sql-server/SqlServerAutomaticMigrations.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"SqlServerAutomaticMigrations.js","sourceRoot":"","sources":["../../../src/migrations/sql-server/SqlServerAutomaticMigrations.ts"],"names":[],"mappings":"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"}