@contember/engine-system-api 1.3.6 → 1.4.0-alpha.2

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 (82) hide show
  1. package/dist/src/SystemContainer.d.ts +3 -2
  2. package/dist/src/SystemContainer.d.ts.map +1 -1
  3. package/dist/src/SystemContainer.js +2 -1
  4. package/dist/src/SystemContainer.js.map +1 -1
  5. package/dist/src/bin/runMigrations.js +2 -5
  6. package/dist/src/bin/runMigrations.js.map +1 -1
  7. package/dist/src/index.d.ts +1 -1
  8. package/dist/src/index.d.ts.map +1 -1
  9. package/dist/src/index.js +1 -2
  10. package/dist/src/index.js.map +1 -1
  11. package/dist/src/migrations/2022-10-03-110000-table-on-delete.js +2 -2
  12. package/dist/src/migrations/2022-10-03-110000-table-on-delete.js.map +1 -1
  13. package/dist/src/migrations/2023-09-11-174000-fix-on-delete.d.ts.map +1 -1
  14. package/dist/src/migrations/2023-09-11-174000-fix-on-delete.js +10 -13
  15. package/dist/src/migrations/2023-09-11-174000-fix-on-delete.js.map +1 -1
  16. package/dist/src/migrations/2023-10-19-173000-fix-unique.d.ts.map +1 -1
  17. package/dist/src/migrations/2023-10-19-173000-fix-unique.js +1 -1
  18. package/dist/src/migrations/2023-10-19-173000-fix-unique.js.map +1 -1
  19. package/dist/src/migrations/runner.d.ts +2 -3
  20. package/dist/src/migrations/runner.d.ts.map +1 -1
  21. package/dist/src/migrations/runner.js +1 -1
  22. package/dist/src/migrations/runner.js.map +1 -1
  23. package/dist/src/migrations/types.d.ts +2 -3
  24. package/dist/src/migrations/types.d.ts.map +1 -1
  25. package/dist/src/model/ProjectInitializer.d.ts +3 -3
  26. package/dist/src/model/ProjectInitializer.d.ts.map +1 -1
  27. package/dist/src/model/ProjectInitializer.js +3 -3
  28. package/dist/src/model/ProjectInitializer.js.map +1 -1
  29. package/dist/src/model/database/DatabaseContext.d.ts +2 -3
  30. package/dist/src/model/database/DatabaseContext.d.ts.map +1 -1
  31. package/dist/src/model/database/DatabaseContext.js +2 -3
  32. package/dist/src/model/database/DatabaseContext.js.map +1 -1
  33. package/dist/src/model/metadata/SchemaDatabaseMetadataResolverStore.d.ts +4 -5
  34. package/dist/src/model/metadata/SchemaDatabaseMetadataResolverStore.d.ts.map +1 -1
  35. package/dist/src/model/metadata/SchemaDatabaseMetadataResolverStore.js +1 -1
  36. package/dist/src/model/metadata/SchemaDatabaseMetadataResolverStore.js.map +1 -1
  37. package/dist/src/model/metadata/index.d.ts +0 -2
  38. package/dist/src/model/metadata/index.d.ts.map +1 -1
  39. package/dist/src/model/metadata/index.js +0 -4
  40. package/dist/src/model/metadata/index.js.map +1 -1
  41. package/dist/src/tsconfig.tsbuildinfo +1 -1
  42. package/dist/tests/cases/migrations/2020-05-06-150000-composed-primary.test.js +2 -2
  43. package/dist/tests/cases/migrations/2020-05-06-150000-composed-primary.test.js.map +1 -1
  44. package/dist/tests/cases/migrations/2020-06-01-103000-event-trigger-perf.test.js +2 -2
  45. package/dist/tests/cases/migrations/2020-06-01-103000-event-trigger-perf.test.js.map +1 -1
  46. package/dist/tests/cases/migrations/2022-10-03-110000-table-on-delete.test.js +15 -1
  47. package/dist/tests/cases/migrations/2022-10-03-110000-table-on-delete.test.js.map +1 -1
  48. package/dist/tests/cases/migrations/2023-09-11-174000-fix-on-delete.test.d.ts +2 -0
  49. package/dist/tests/cases/migrations/2023-09-11-174000-fix-on-delete.test.d.ts.map +1 -0
  50. package/dist/tests/cases/migrations/2023-09-11-174000-fix-on-delete.test.js +97 -0
  51. package/dist/tests/cases/migrations/2023-09-11-174000-fix-on-delete.test.js.map +1 -0
  52. package/dist/tests/cases/migrations/2023-10-19-173000-fix-unique.test.js +12 -11
  53. package/dist/tests/cases/migrations/2023-10-19-173000-fix-unique.test.js.map +1 -1
  54. package/dist/tests/tsconfig.tsbuildinfo +1 -1
  55. package/package.json +14 -14
  56. package/src/SystemContainer.ts +3 -2
  57. package/src/bin/runMigrations.ts +4 -9
  58. package/src/index.ts +0 -1
  59. package/src/migrations/2022-10-03-110000-table-on-delete.ts +5 -5
  60. package/src/migrations/2023-09-11-174000-fix-on-delete.ts +13 -16
  61. package/src/migrations/2023-10-19-173000-fix-unique.ts +3 -4
  62. package/src/migrations/runner.ts +3 -4
  63. package/src/migrations/types.ts +2 -3
  64. package/src/model/ProjectInitializer.ts +3 -3
  65. package/src/model/database/DatabaseContext.ts +2 -3
  66. package/src/model/metadata/SchemaDatabaseMetadataResolverStore.ts +6 -7
  67. package/src/model/metadata/index.ts +0 -2
  68. package/tests/cases/migrations/2020-05-06-150000-composed-primary.test.ts +2 -2
  69. package/tests/cases/migrations/2020-06-01-103000-event-trigger-perf.test.ts +2 -2
  70. package/tests/cases/migrations/2022-10-03-110000-table-on-delete.test.ts +16 -2
  71. package/tests/cases/migrations/2023-09-11-174000-fix-on-delete.test.ts +106 -0
  72. package/tests/cases/migrations/2023-10-19-173000-fix-unique.test.ts +12 -12
  73. package/dist/src/model/metadata/ResolvedDatabaseMetadata.d.ts +0 -14
  74. package/dist/src/model/metadata/ResolvedDatabaseMetadata.d.ts.map +0 -1
  75. package/dist/src/model/metadata/ResolvedDatabaseMetadata.js +0 -49
  76. package/dist/src/model/metadata/ResolvedDatabaseMetadata.js.map +0 -1
  77. package/dist/src/model/metadata/SchemaDatabaseMetadataResolver.d.ts +0 -8
  78. package/dist/src/model/metadata/SchemaDatabaseMetadataResolver.d.ts.map +0 -1
  79. package/dist/src/model/metadata/SchemaDatabaseMetadataResolver.js +0 -98
  80. package/dist/src/model/metadata/SchemaDatabaseMetadataResolver.js.map +0 -1
  81. package/src/model/metadata/ResolvedDatabaseMetadata.ts +0 -62
  82. package/src/model/metadata/SchemaDatabaseMetadataResolver.ts +0 -140
@@ -1,10 +1,11 @@
1
1
  import { AccessEvaluator, Authorizator } from '@contember/authorization';
2
2
  import { Builder, Container } from '@contember/dic';
3
3
  import { MigrationDescriber, ModificationHandlerFactory, SchemaDiffer, SchemaMigrator } from '@contember/schema-migrations';
4
- import { EventResponseBuilder, ExecutedMigrationsResolver, IdentityFetcher, MigrationAlterer, MigrationsDatabaseMetadataResolverStoreFactory, ProjectMigrator, ProjectTruncateExecutor, SchemaDatabaseMetadataResolver, SchemaVersionBuilder } from './model';
4
+ import { EventResponseBuilder, ExecutedMigrationsResolver, IdentityFetcher, MigrationAlterer, MigrationsDatabaseMetadataResolverStoreFactory, ProjectMigrator, ProjectTruncateExecutor, SchemaVersionBuilder } from './model';
5
5
  import { UuidProvider } from './utils';
6
6
  import { EventsQueryResolver, ExecutedMigrationsQueryResolver, MigrateMutationResolver, MigrationAlterMutationResolver, ResolverFactory, StagesQueryResolver, SystemResolverContextFactory, TruncateMutationResolver } from './resolvers';
7
7
  import { EventOldValuesResolver } from './resolvers/types';
8
+ import { DatabaseMetadataResolver } from '@contember/database';
8
9
  export interface SystemContainer {
9
10
  systemResolversFactory: ResolverFactory;
10
11
  authorizator: Authorizator;
@@ -40,7 +41,7 @@ export declare class SystemContainerFactory {
40
41
  } & {
41
42
  migrationDescriber: MigrationDescriber;
42
43
  } & {
43
- databaseMetadataResolver: SchemaDatabaseMetadataResolver;
44
+ databaseMetadataResolver: DatabaseMetadataResolver;
44
45
  } & {
45
46
  migrationsDatabaseMetadataResolverStoreFactory: MigrationsDatabaseMetadataResolverStoreFactory;
46
47
  } & {
@@ -1 +1 @@
1
- {"version":3,"file":"SystemContainer.d.ts","sourceRoot":"","sources":["../../src/SystemContainer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AACxE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AACnD,OAAO,EACN,kBAAkB,EAClB,0BAA0B,EAC1B,YAAY,EACZ,cAAc,EACd,MAAM,8BAA8B,CAAA;AACrC,OAAO,EACN,oBAAoB,EACpB,0BAA0B,EAC1B,eAAe,EACf,gBAAgB,EAChB,8CAA8C,EAE9C,eAAe,EACf,uBAAuB,EAAE,8BAA8B,EACvD,oBAAoB,EACpB,MAAM,SAAS,CAAA;AAChB,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AACtC,OAAO,EACN,mBAAmB,EACnB,+BAA+B,EAC/B,uBAAuB,EACvB,8BAA8B,EAC9B,eAAe,EACf,mBAAmB,EACnB,4BAA4B,EAC5B,wBAAwB,EACxB,MAAM,aAAa,CAAA;AACpB,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAA;AAE1D,MAAM,WAAW,eAAe;IAC/B,sBAAsB,EAAE,eAAe,CAAA;IACvC,YAAY,EAAE,YAAY,CAAA;IAC1B,sBAAsB,EAAE,4BAA4B,CAAA;IACpD,oBAAoB,EAAE,oBAAoB,CAAA;CAC1C;AAED,KAAK,IAAI,GAAG;IACX,eAAe,EAAE,eAAe,CAAA;CAChC,CAAA;AAED,qBAAa,sBAAsB;IAEjC,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,0BAA0B;gBAD1B,SAAS,EAAE,YAAY,EACvB,0BAA0B,EAAE,0BAA0B;IAIjE,MAAM,CAAC,SAAS,EAAE,IAAI,GAAG,SAAS,CAAC,eAAe,CAAC;IAUnD,aAAa,CAAC,EAAE,eAAe,EAAE,EAAE,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAqD9C"}
1
+ {"version":3,"file":"SystemContainer.d.ts","sourceRoot":"","sources":["../../src/SystemContainer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AACxE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AACnD,OAAO,EACN,kBAAkB,EAClB,0BAA0B,EAC1B,YAAY,EACZ,cAAc,EACd,MAAM,8BAA8B,CAAA;AACrC,OAAO,EACN,oBAAoB,EACpB,0BAA0B,EAC1B,eAAe,EACf,gBAAgB,EAChB,8CAA8C,EAE9C,eAAe,EACf,uBAAuB,EACvB,oBAAoB,EACpB,MAAM,SAAS,CAAA;AAChB,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AACtC,OAAO,EACN,mBAAmB,EACnB,+BAA+B,EAC/B,uBAAuB,EACvB,8BAA8B,EAC9B,eAAe,EACf,mBAAmB,EACnB,4BAA4B,EAC5B,wBAAwB,EACxB,MAAM,aAAa,CAAA;AACpB,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAA;AAC1D,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAA;AAE9D,MAAM,WAAW,eAAe;IAC/B,sBAAsB,EAAE,eAAe,CAAA;IACvC,YAAY,EAAE,YAAY,CAAA;IAC1B,sBAAsB,EAAE,4BAA4B,CAAA;IACpD,oBAAoB,EAAE,oBAAoB,CAAA;CAC1C;AAED,KAAK,IAAI,GAAG;IACX,eAAe,EAAE,eAAe,CAAA;CAChC,CAAA;AAED,qBAAa,sBAAsB;IAEjC,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,0BAA0B;gBAD1B,SAAS,EAAE,YAAY,EACvB,0BAA0B,EAAE,0BAA0B;IAIjE,MAAM,CAAC,SAAS,EAAE,IAAI,GAAG,SAAS,CAAC,eAAe,CAAC;IAUnD,aAAa,CAAC,EAAE,eAAe,EAAE,EAAE,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAqD9C"}
@@ -7,6 +7,7 @@ const schema_migrations_1 = require("@contember/schema-migrations");
7
7
  const model_1 = require("./model");
8
8
  const resolvers_1 = require("./resolvers");
9
9
  const types_1 = require("./resolvers/types");
10
+ const database_1 = require("@contember/database");
10
11
  class SystemContainerFactory {
11
12
  constructor(providers, modificationHandlerFactory) {
12
13
  this.providers = providers;
@@ -29,7 +30,7 @@ class SystemContainerFactory {
29
30
  .addService('authorizator', ({ accessEvaluator }) => new authorization_1.Authorizator.Default(accessEvaluator))
30
31
  .addService('schemaDiffer', ({ schemaMigrator }) => new schema_migrations_1.SchemaDiffer(schemaMigrator))
31
32
  .addService('migrationDescriber', ({ modificationHandlerFactory }) => new schema_migrations_1.MigrationDescriber(modificationHandlerFactory))
32
- .addService('databaseMetadataResolver', () => new model_1.SchemaDatabaseMetadataResolver())
33
+ .addService('databaseMetadataResolver', () => new database_1.DatabaseMetadataResolver())
33
34
  .addService('migrationsDatabaseMetadataResolverStoreFactory', ({ databaseMetadataResolver }) => new model_1.MigrationsDatabaseMetadataResolverStoreFactory(databaseMetadataResolver))
34
35
  .addService('projectMigrator', ({ migrationDescriber, schemaVersionBuilder, executedMigrationsResolver, migrationsDatabaseMetadataResolverStoreFactory }) => new model_1.ProjectMigrator(migrationDescriber, schemaVersionBuilder, executedMigrationsResolver, migrationsDatabaseMetadataResolverStoreFactory))
35
36
  .addService('projectTruncateExecutor', () => new model_1.ProjectTruncateExecutor())
@@ -1 +1 @@
1
- {"version":3,"file":"SystemContainer.js","sourceRoot":"","sources":["../../src/SystemContainer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"SystemContainer.js","sourceRoot":"","sources":["../../src/SystemContainer.ts"],"names":[],"mappings":"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"}
@@ -4,7 +4,6 @@ const migrations_1 = require("../migrations");
4
4
  const model_1 = require("../model");
5
5
  const database_1 = require("@contember/database");
6
6
  const logger_1 = require("@contember/logger");
7
- const schema_utils_1 = require("@contember/schema-utils");
8
7
  (async () => {
9
8
  const dbConfig = {
10
9
  database: process.env.PGDATABASE,
@@ -13,16 +12,14 @@ const schema_utils_1 = require("@contember/schema-utils");
13
12
  user: process.env.PGUSER,
14
13
  port: process.env.PGPORT ? Number(process.env.PGPORT) : 5432,
15
14
  };
16
- // eslint-disable-next-line no-console
17
- const connection = database_1.Connection.createSingle(dbConfig, err => console.error(err));
18
- const migrationsRunner = new migrations_1.SystemMigrationsRunner(new model_1.DatabaseContextFactory('system', connection, {
15
+ const migrationsRunner = new migrations_1.SystemMigrationsRunner(new model_1.DatabaseContextFactory('system', {
19
16
  uuid: () => {
20
17
  throw new Error();
21
18
  },
22
19
  }), { db: dbConfig, slug: 'test', stages: [] }, 'system', {
23
20
  buildSchema: () => Promise.resolve(model_1.emptyVersionedSchema),
24
21
  }, {}, {
25
- resolveMetadata: () => Promise.resolve(schema_utils_1.dummySchemaDatabaseMetadata),
22
+ resolveMetadata: () => Promise.resolve(database_1.emptyDatabaseMetadata),
26
23
  });
27
24
  // eslint-disable-next-line no-console
28
25
  await migrationsRunner.run((0, logger_1.createLogger)(new logger_1.PrettyPrintLoggerHandler(process.stderr)));
@@ -1 +1 @@
1
- {"version":3,"file":"runMigrations.js","sourceRoot":"","sources":["../../../src/bin/runMigrations.ts"],"names":[],"mappings":";;AAAA,8CAAsD;AACtD,oCAA6F;AAC7F,kDAAgD;AAChD,8CAA0E;AAI1E,0DAAsE;AAEtE,CAAC,KAAK,IAAI,EAAE;IACX,MAAM,QAAQ,GAAG;QAChB,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,UAAoB;QAC1C,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,MAAgB;QAClC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,UAAoB;QAC1C,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,MAAgB;QAClC,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI;KAC5D,CAAA;IACD,sCAAsC;IACtC,MAAM,UAAU,GAAG,qBAAU,CAAC,YAAY,CAAC,QAAQ,EAAE,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAA;IAC/E,MAAM,gBAAgB,GAAG,IAAI,mCAAsB,CAClD,IAAI,8BAAsB,CAAC,QAAQ,EAAE,UAAU,EAAE;QAChD,IAAI,EAAE,GAAG,EAAE;YACV,MAAM,IAAI,KAAK,EAAE,CAAA;QAClB,CAAC;KACD,CAAC,EACF,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,EAC1C,QAAQ,EACR;QACC,WAAW,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,4BAAoB,CAAC;KACrB,EACpC,EAAE,EACF;QACC,eAAe,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,0CAA2B,CAAC;KACtB,CAC9C,CAAA;IACD,sCAAsC;IACtC,MAAM,gBAAgB,CAAC,GAAG,CAAC,IAAA,qBAAY,EAAC,IAAI,iCAAwB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;AACvF,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;IACd,sCAAsC;IACtC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IAChB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AAChB,CAAC,CAAC,CAAA"}
1
+ {"version":3,"file":"runMigrations.js","sourceRoot":"","sources":["../../../src/bin/runMigrations.ts"],"names":[],"mappings":";;AAAA,8CAAsD;AACtD,oCAA6F;AAC7F,kDAAiG;AACjG,8CAA0E;AAG1E,CAAC,KAAK,IAAI,EAAE;IACX,MAAM,QAAQ,GAAG;QAChB,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,UAAoB;QAC1C,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,MAAgB;QAClC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,UAAoB;QAC1C,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,MAAgB;QAClC,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI;KAC5D,CAAA;IACD,MAAM,gBAAgB,GAAG,IAAI,mCAAsB,CAClD,IAAI,8BAAsB,CAAC,QAAQ,EAAE;QACpC,IAAI,EAAE,GAAG,EAAE;YACV,MAAM,IAAI,KAAK,EAAE,CAAA;QAClB,CAAC;KACD,CAAC,EACF,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,EAC1C,QAAQ,EACR;QACC,WAAW,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,4BAAoB,CAAC;KACrB,EACpC,EAAE,EACF;QACC,eAAe,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,gCAAqB,CAAC;KACtB,CACxC,CAAA;IACD,sCAAsC;IACtC,MAAM,gBAAgB,CAAC,GAAG,CAAC,IAAA,qBAAY,EAAC,IAAI,iCAAwB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;AACvF,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;IACd,sCAAsC;IACtC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IAChB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AAChB,CAAC,CAAC,CAAA"}
@@ -1,6 +1,6 @@
1
1
  export { SchemaMigrator, MigrationsResolver } from '@contember/schema-migrations';
2
2
  export { typeDefs, devTypeDefs, Schema } from './schema';
3
- export { DatabaseContext, DatabaseContextFactory, Command, formatSchemaName, getJunctionTables, Identity, LatestTransactionIdByStageQuery, ProjectInitializer, ProjectMigrator, SchemaDatabaseMetadataResolver, SchemaVersionBuilder, Stage, StageBySlugQuery, StageCreator, StagesQuery, VersionedSchema, } from './model';
3
+ export { DatabaseContext, DatabaseContextFactory, Command, formatSchemaName, getJunctionTables, Identity, LatestTransactionIdByStageQuery, ProjectInitializer, ProjectMigrator, SchemaVersionBuilder, Stage, StageBySlugQuery, StageCreator, StagesQuery, VersionedSchema, } from './model';
4
4
  export * from './SystemContainer';
5
5
  export * from './resolvers';
6
6
  export * from './types';
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAA;AAEjF,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AAExD,OAAO,EACN,eAAe,EACf,sBAAsB,EACtB,OAAO,EACP,gBAAgB,EAChB,iBAAiB,EACjB,QAAQ,EACR,+BAA+B,EAC/B,kBAAkB,EAClB,eAAe,EACf,8BAA8B,EAC9B,oBAAoB,EACpB,KAAK,EACL,gBAAgB,EAChB,YAAY,EACZ,WAAW,EACX,eAAe,GACf,MAAM,SAAS,CAAA;AAChB,cAAc,mBAAmB,CAAA;AACjC,cAAc,aAAa,CAAA;AAC3B,cAAc,SAAS,CAAA;AACvB,cAAc,SAAS,CAAA;AACvB,cAAc,cAAc,CAAA"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAA;AAEjF,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AAExD,OAAO,EACN,eAAe,EACf,sBAAsB,EACtB,OAAO,EACP,gBAAgB,EAChB,iBAAiB,EACjB,QAAQ,EACR,+BAA+B,EAC/B,kBAAkB,EAClB,eAAe,EACf,oBAAoB,EACpB,KAAK,EACL,gBAAgB,EAChB,YAAY,EACZ,WAAW,EACX,eAAe,GACf,MAAM,SAAS,CAAA;AAChB,cAAc,mBAAmB,CAAA;AACjC,cAAc,aAAa,CAAA;AAC3B,cAAc,SAAS,CAAA;AACvB,cAAc,SAAS,CAAA;AACvB,cAAc,cAAc,CAAA"}
package/dist/src/index.js CHANGED
@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
14
14
  for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
15
15
  };
16
16
  Object.defineProperty(exports, "__esModule", { value: true });
17
- exports.StagesQuery = exports.StageCreator = exports.StageBySlugQuery = exports.SchemaVersionBuilder = exports.SchemaDatabaseMetadataResolver = exports.ProjectMigrator = exports.ProjectInitializer = exports.LatestTransactionIdByStageQuery = exports.Identity = exports.getJunctionTables = exports.formatSchemaName = exports.DatabaseContextFactory = exports.Schema = exports.devTypeDefs = exports.typeDefs = exports.MigrationsResolver = exports.SchemaMigrator = void 0;
17
+ exports.StagesQuery = exports.StageCreator = exports.StageBySlugQuery = exports.SchemaVersionBuilder = exports.ProjectMigrator = exports.ProjectInitializer = exports.LatestTransactionIdByStageQuery = exports.Identity = exports.getJunctionTables = exports.formatSchemaName = exports.DatabaseContextFactory = exports.Schema = exports.devTypeDefs = exports.typeDefs = exports.MigrationsResolver = exports.SchemaMigrator = void 0;
18
18
  var schema_migrations_1 = require("@contember/schema-migrations");
19
19
  Object.defineProperty(exports, "SchemaMigrator", { enumerable: true, get: function () { return schema_migrations_1.SchemaMigrator; } });
20
20
  Object.defineProperty(exports, "MigrationsResolver", { enumerable: true, get: function () { return schema_migrations_1.MigrationsResolver; } });
@@ -30,7 +30,6 @@ Object.defineProperty(exports, "Identity", { enumerable: true, get: function ()
30
30
  Object.defineProperty(exports, "LatestTransactionIdByStageQuery", { enumerable: true, get: function () { return model_1.LatestTransactionIdByStageQuery; } });
31
31
  Object.defineProperty(exports, "ProjectInitializer", { enumerable: true, get: function () { return model_1.ProjectInitializer; } });
32
32
  Object.defineProperty(exports, "ProjectMigrator", { enumerable: true, get: function () { return model_1.ProjectMigrator; } });
33
- Object.defineProperty(exports, "SchemaDatabaseMetadataResolver", { enumerable: true, get: function () { return model_1.SchemaDatabaseMetadataResolver; } });
34
33
  Object.defineProperty(exports, "SchemaVersionBuilder", { enumerable: true, get: function () { return model_1.SchemaVersionBuilder; } });
35
34
  Object.defineProperty(exports, "StageBySlugQuery", { enumerable: true, get: function () { return model_1.StageBySlugQuery; } });
36
35
  Object.defineProperty(exports, "StageCreator", { enumerable: true, get: function () { return model_1.StageCreator; } });
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,kEAAiF;AAAxE,mHAAA,cAAc,OAAA;AAAE,uHAAA,kBAAkB,OAAA;AAE3C,mCAAwD;AAA/C,kGAAA,QAAQ,OAAA;AAAE,qGAAA,WAAW,OAAA;AAAE,gGAAA,MAAM,OAAA;AAEtC,iCAiBgB;AAff,+GAAA,sBAAsB,OAAA;AAEtB,yGAAA,gBAAgB,OAAA;AAChB,0GAAA,iBAAiB,OAAA;AACjB,iGAAA,QAAQ,OAAA;AACR,wHAAA,+BAA+B,OAAA;AAC/B,2GAAA,kBAAkB,OAAA;AAClB,wGAAA,eAAe,OAAA;AACf,uHAAA,8BAA8B,OAAA;AAC9B,6GAAA,oBAAoB,OAAA;AAEpB,yGAAA,gBAAgB,OAAA;AAChB,qGAAA,YAAY,OAAA;AACZ,oGAAA,WAAW,OAAA;AAGZ,oDAAiC;AACjC,8CAA2B;AAC3B,0CAAuB;AACvB,0CAAuB;AACvB,+CAA4B"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,kEAAiF;AAAxE,mHAAA,cAAc,OAAA;AAAE,uHAAA,kBAAkB,OAAA;AAE3C,mCAAwD;AAA/C,kGAAA,QAAQ,OAAA;AAAE,qGAAA,WAAW,OAAA;AAAE,gGAAA,MAAM,OAAA;AAEtC,iCAgBgB;AAdf,+GAAA,sBAAsB,OAAA;AAEtB,yGAAA,gBAAgB,OAAA;AAChB,0GAAA,iBAAiB,OAAA;AACjB,iGAAA,QAAQ,OAAA;AACR,wHAAA,+BAA+B,OAAA;AAC/B,2GAAA,kBAAkB,OAAA;AAClB,wGAAA,eAAe,OAAA;AACf,6GAAA,oBAAoB,OAAA;AAEpB,yGAAA,gBAAgB,OAAA;AAChB,qGAAA,YAAY,OAAA;AACZ,oGAAA,WAAW,OAAA;AAGZ,oDAAiC;AACjC,8CAA2B;AAC3B,0CAAuB;AACvB,0CAAuB;AACvB,+CAA4B"}
@@ -36,12 +36,12 @@ async function default_1(builder, args) {
36
36
  }
37
37
  for (const stage of stages) {
38
38
  const databaseMetadata = (_a = metadataByStage[_b = stage.schema]) !== null && _a !== void 0 ? _a : (metadataByStage[_b] = await args.databaseMetadataResolver(args.connection, stage.schema));
39
- const fkNames = databaseMetadata.getForeignKeyConstraintNames({
39
+ const fkNames = databaseMetadata.foreignKeys.filter({
40
40
  fromTable: entity.tableName,
41
41
  fromColumn: relation.joiningColumn.columnName,
42
42
  toTable: targetEntity.tableName,
43
43
  toColumn: targetEntity.primaryColumn,
44
- });
44
+ }).getNames();
45
45
  for (const name of fkNames) {
46
46
  builder.sql(`ALTER TABLE ${(0, database_1.wrapIdentifier)(stage.schema)}.${(0, database_1.wrapIdentifier)(entity.tableName)} DROP CONSTRAINT ${(0, database_1.wrapIdentifier)(name)}`);
47
47
  }
@@ -1 +1 @@
1
- {"version":3,"file":"2022-10-03-110000-table-on-delete.js","sourceRoot":"","sources":["../../../src/migrations/2022-10-03-110000-table-on-delete.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"2022-10-03-110000-table-on-delete.js","sourceRoot":"","sources":["../../../src/migrations/2022-10-03-110000-table-on-delete.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"2023-09-11-174000-fix-on-delete.d.ts","sourceRoot":"","sources":["../../../src/migrations/2023-09-11-174000-fix-on-delete.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAEhF,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAA;AAI7C,yBAA+B,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,aAAa,CAAC,mBAAmB,CAAC,iBAsEjG"}
1
+ {"version":3,"file":"2023-09-11-174000-fix-on-delete.d.ts","sourceRoot":"","sources":["../../../src/migrations/2023-09-11-174000-fix-on-delete.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAEhF,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAA;AAI7C,yBAA+B,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,aAAa,CAAC,mBAAmB,CAAC,iBAmEjG"}
@@ -33,25 +33,22 @@ async function default_1(builder, args) {
33
33
  }
34
34
  for (const stage of stages) {
35
35
  const databaseMetadata = (_a = metadataByStage[_b = stage.schema]) !== null && _a !== void 0 ? _a : (metadataByStage[_b] = await args.databaseMetadataResolver(args.connection, stage.schema));
36
- const fkNames = databaseMetadata.getForeignKeyConstraintNames({
36
+ const fks = databaseMetadata.foreignKeys.filter({
37
37
  fromTable: entity.tableName,
38
38
  fromColumn: relation.joiningColumn.columnName,
39
39
  toTable: targetEntity.tableName,
40
40
  toColumn: targetEntity.primaryColumn,
41
- });
42
- if (fkNames.every(it => {
43
- const constraint = databaseMetadata.getForeignKeyConstraint(entity.tableName, it);
44
- const dbConstraintFlag = {
45
- [schema_1.Model.OnDelete.setNull]: schema_utils_1.ForeignKeyDeleteAction.setnull,
46
- [schema_1.Model.OnDelete.cascade]: schema_utils_1.ForeignKeyDeleteAction.cascade,
47
- [schema_1.Model.OnDelete.restrict]: schema_utils_1.ForeignKeyDeleteAction.restrict,
48
- }[relation.joiningColumn.onDelete];
49
- return constraint && constraint.deleteAction === dbConstraintFlag;
50
- })) {
41
+ }).toArray();
42
+ const dbConstraintFlag = {
43
+ [schema_1.Model.OnDelete.setNull]: database_1.ForeignKeyDeleteAction.setnull,
44
+ [schema_1.Model.OnDelete.cascade]: database_1.ForeignKeyDeleteAction.cascade,
45
+ [schema_1.Model.OnDelete.restrict]: database_1.ForeignKeyDeleteAction.restrict,
46
+ }[relation.joiningColumn.onDelete];
47
+ if (fks.every(it => it.deleteAction === dbConstraintFlag)) {
51
48
  continue;
52
49
  }
53
- for (const name of fkNames) {
54
- builder.sql(`ALTER TABLE ${(0, database_1.wrapIdentifier)(stage.schema)}.${(0, database_1.wrapIdentifier)(entity.tableName)} DROP CONSTRAINT ${(0, database_1.wrapIdentifier)(name)}`);
50
+ for (const fk of fks) {
51
+ builder.sql(`ALTER TABLE ${(0, database_1.wrapIdentifier)(stage.schema)}.${(0, database_1.wrapIdentifier)(entity.tableName)} DROP CONSTRAINT ${(0, database_1.wrapIdentifier)(fk.constraintName)}`);
55
52
  }
56
53
  const onDelete = {
57
54
  [schema_1.Model.OnDelete.setNull]: 'SET NULL',
@@ -1 +1 @@
1
- {"version":3,"file":"2023-09-11-174000-fix-on-delete.js","sourceRoot":"","sources":["../../../src/migrations/2023-09-11-174000-fix-on-delete.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"2023-09-11-174000-fix-on-delete.js","sourceRoot":"","sources":["../../../src/migrations/2023-09-11-174000-fix-on-delete.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"2023-10-19-173000-fix-unique.d.ts","sourceRoot":"","sources":["../../../src/migrations/2023-10-19-173000-fix-unique.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAEhF,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAA;AAI7C,yBAA+B,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,aAAa,CAAC,mBAAmB,CAAC,iBAkCjG"}
1
+ {"version":3,"file":"2023-10-19-173000-fix-unique.d.ts","sourceRoot":"","sources":["../../../src/migrations/2023-10-19-173000-fix-unique.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAEhF,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAA;AAG7C,yBAA+B,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,aAAa,CAAC,mBAAmB,CAAC,iBAkCjG"}
@@ -23,7 +23,7 @@ async function default_1(builder, args) {
23
23
  }
24
24
  for (const stage of stages) {
25
25
  const databaseMetadata = (_a = metadataByStage[_b = stage.schema]) !== null && _a !== void 0 ? _a : (metadataByStage[_b] = await args.databaseMetadataResolver(args.connection, stage.schema));
26
- const existingUniqueConstraints = databaseMetadata.getAllUniqueConstraints().filter(it => it.tableName === entity.tableName);
26
+ const existingUniqueConstraints = databaseMetadata.uniqueConstraints.filter({ tableName: entity.tableName }).toArray();
27
27
  for (const constraint of existingUniqueConstraints) {
28
28
  if (constraint.columnNames.length === 1 || expectedUnique.some(it => stringArrayEquals(it, constraint.columnNames))) {
29
29
  continue;
@@ -1 +1 @@
1
- {"version":3,"file":"2023-10-19-173000-fix-unique.js","sourceRoot":"","sources":["../../../src/migrations/2023-10-19-173000-fix-unique.ts"],"names":[],"mappings":";;AACA,kDAAoD;AAGpD,oEAAyE;AAE1D,KAAK,oBAAW,OAAyB,EAAE,IAAwC;;;IACjG,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;IACzD,MAAM,MAAM,GAAG,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAmB,0BAA0B,CAAC,CAAC,CAAC,IAAI,CAAA;IAC/F,MAAM,eAAe,GAA2C,EAAE,CAAA;IAElE,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;QAC1D,IAAI,MAAM,CAAC,IAAI,EAAE;YAChB,SAAQ;SACR;QAED,MAAM,cAAc,GAAe,EAAE,CAAA;QAErC,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,MAAM,EAAE;YACjC,MAAM,OAAO,GAAG,IAAA,8CAA0B,EAAC;gBAC1C,MAAM;gBACN,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,KAAK,EAAE,MAAM,CAAC,KAAK;aACnB,CAAC,CAAA;YACF,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;SAC5B;QAGD,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;YAC3B,MAAM,gBAAgB,SAAG,eAAe,MAAC,KAAK,CAAC,MAAM,qCAA5B,eAAe,OAAmB,MAAM,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA,CAAA;YAE7H,MAAM,yBAAyB,GAAG,gBAAgB,CAAC,uBAAuB,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,KAAK,MAAM,CAAC,SAAS,CAAC,CAAA;YAC5H,KAAK,MAAM,UAAU,IAAI,yBAAyB,EAAE;gBACnD,IAAI,UAAU,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC,IAAI,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,iBAAiB,CAAC,EAAE,EAAE,UAAU,CAAC,WAAW,CAAC,CAAC,EAAE;oBACpH,SAAQ;iBACR;gBACD,OAAO,CAAC,GAAG,CAAC,eAAe,IAAA,yBAAc,EAAC,KAAK,CAAC,MAAM,CAAC,IAAI,IAAA,yBAAc,EAAC,MAAM,CAAC,SAAS,CAAC,oBAAoB,IAAA,yBAAc,EAAC,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC,CAAA;aAC3J;SACD;KACD;AACF,CAAC;AAlCD,4BAkCC;AACD,MAAM,iBAAiB,GAAG,CAAC,IAAc,EAAE,IAAc,EAAE,EAAE;IAC5D,IAAI,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,EAAE;QAChC,OAAO,KAAK,CAAA;KACZ;IACD,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,IAAI,EAAE,CAAA;IAC1B,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,IAAI,EAAE,CAAA;IAC1B,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,CAAA;AAC/C,CAAC,CAAA"}
1
+ {"version":3,"file":"2023-10-19-173000-fix-unique.js","sourceRoot":"","sources":["../../../src/migrations/2023-10-19-173000-fix-unique.ts"],"names":[],"mappings":";;AACA,kDAAsE;AAEtE,oEAAyE;AAE1D,KAAK,oBAAW,OAAyB,EAAE,IAAwC;;;IACjG,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;IACzD,MAAM,MAAM,GAAG,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAmB,0BAA0B,CAAC,CAAC,CAAC,IAAI,CAAA;IAC/F,MAAM,eAAe,GAAqC,EAAE,CAAA;IAE5D,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;QAC1D,IAAI,MAAM,CAAC,IAAI,EAAE;YAChB,SAAQ;SACR;QAED,MAAM,cAAc,GAAe,EAAE,CAAA;QAErC,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,MAAM,EAAE;YACjC,MAAM,OAAO,GAAG,IAAA,8CAA0B,EAAC;gBAC1C,MAAM;gBACN,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,KAAK,EAAE,MAAM,CAAC,KAAK;aACnB,CAAC,CAAA;YACF,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;SAC5B;QAGD,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;YAC3B,MAAM,gBAAgB,SAAG,eAAe,MAAC,KAAK,CAAC,MAAM,qCAA5B,eAAe,OAAmB,MAAM,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA,CAAA;YAE7H,MAAM,yBAAyB,GAAG,gBAAgB,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,OAAO,EAAE,CAAA;YACtH,KAAK,MAAM,UAAU,IAAI,yBAAyB,EAAE;gBACnD,IAAI,UAAU,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC,IAAI,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,iBAAiB,CAAC,EAAE,EAAE,UAAU,CAAC,WAAW,CAAC,CAAC,EAAE;oBACpH,SAAQ;iBACR;gBACD,OAAO,CAAC,GAAG,CAAC,eAAe,IAAA,yBAAc,EAAC,KAAK,CAAC,MAAM,CAAC,IAAI,IAAA,yBAAc,EAAC,MAAM,CAAC,SAAS,CAAC,oBAAoB,IAAA,yBAAc,EAAC,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC,CAAA;aAC3J;SACD;KACD;AACF,CAAC;AAlCD,4BAkCC;AACD,MAAM,iBAAiB,GAAG,CAAC,IAAc,EAAE,IAAc,EAAE,EAAE;IAC5D,IAAI,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,EAAE;QAChC,OAAO,KAAK,CAAA;KACZ;IACD,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,IAAI,EAAE,CAAA;IAC1B,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,IAAI,EAAE,CAAA;IAC1B,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,CAAA;AAC/C,CAAC,CAAA"}
@@ -1,9 +1,8 @@
1
1
  import { MigrationGroup } from '@contember/database-migrations';
2
- import { DatabaseConfig } from '@contember/database';
2
+ import { DatabaseConfig, DatabaseMetadataResolver } from '@contember/database';
3
3
  import { DatabaseContextFactory, SchemaVersionBuilder } from '../model';
4
4
  import { ProjectConfig } from '../types';
5
5
  import { Logger } from '@contember/logger';
6
- import { SchemaDatabaseMetadataResolver } from '../model/metadata/SchemaDatabaseMetadataResolver';
7
6
  export declare class SystemMigrationsRunner {
8
7
  private readonly databaseContextFactory;
9
8
  private readonly project;
@@ -13,7 +12,7 @@ export declare class SystemMigrationsRunner {
13
12
  private readonly databaseMetadataResolver;
14
13
  constructor(databaseContextFactory: DatabaseContextFactory, project: ProjectConfig & {
15
14
  db: DatabaseConfig;
16
- }, schema: string, schemaVersionBuilder: SchemaVersionBuilder, migrationGroups: Record<string, MigrationGroup<unknown>>, databaseMetadataResolver: SchemaDatabaseMetadataResolver);
15
+ }, schema: string, schemaVersionBuilder: SchemaVersionBuilder, migrationGroups: Record<string, MigrationGroup<unknown>>, databaseMetadataResolver: DatabaseMetadataResolver);
17
16
  run(logger: Logger): Promise<void>;
18
17
  }
19
18
  //# sourceMappingURL=runner.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../../src/migrations/runner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAA0C,MAAM,gCAAgC,CAAA;AAuBvG,OAAO,EAAiD,cAAc,EAAE,MAAM,qBAAqB,CAAA;AACnG,OAAO,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAA;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAG1C,OAAO,EAAE,8BAA8B,EAAE,MAAM,kDAAkD,CAAA;AA0BjG,qBAAa,sBAAsB;IAEjC,OAAO,CAAC,QAAQ,CAAC,sBAAsB;IACvC,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,wBAAwB;gBALxB,sBAAsB,EAAE,sBAAsB,EAC9C,OAAO,EAAE,aAAa,GAAG;QAAE,EAAE,EAAE,cAAc,CAAA;KAAE,EAC/C,MAAM,EAAE,MAAM,EACd,oBAAoB,EAAE,oBAAoB,EAC1C,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC,EACxD,wBAAwB,EAAE,8BAA8B;IAGpE,GAAG,CAAC,MAAM,EAAE,MAAM;CAmCxB"}
1
+ {"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../../src/migrations/runner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAA0C,MAAM,gCAAgC,CAAA;AAuBvG,OAAO,EAAiD,cAAc,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAA;AAC7H,OAAO,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAA;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AA4B1C,qBAAa,sBAAsB;IAEjC,OAAO,CAAC,QAAQ,CAAC,sBAAsB;IACvC,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,wBAAwB;gBALxB,sBAAsB,EAAE,sBAAsB,EAC9C,OAAO,EAAE,aAAa,GAAG;QAAE,EAAE,EAAE,cAAc,CAAA;KAAE,EAC/C,MAAM,EAAE,MAAM,EACd,oBAAoB,EAAE,oBAAoB,EAC1C,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC,EACxD,wBAAwB,EAAE,wBAAwB;IAG9D,GAAG,CAAC,MAAM,EAAE,MAAM;CAmCxB"}
@@ -78,7 +78,7 @@ class SystemMigrationsRunner {
78
78
  schemaResolver,
79
79
  databaseMetadataResolver: (connection, schema) => {
80
80
  const dbContextMigrations = this.databaseContextFactory.create(connection);
81
- return this.databaseMetadataResolver.resolveMetadata(dbContextMigrations, schema);
81
+ return this.databaseMetadataResolver.resolveMetadata(dbContextMigrations.client, schema);
82
82
  },
83
83
  });
84
84
  });
@@ -1 +1 @@
1
- {"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../src/migrations/runner.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../src/migrations/runner.ts"],"names":[],"mappings":"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"}
@@ -1,10 +1,9 @@
1
1
  import { Schema } from '@contember/schema';
2
2
  import { ProjectConfig } from '../types';
3
- import { Connection } from '@contember/database';
4
- import { SchemaDatabaseMetadata } from '@contember/schema-utils';
3
+ import { Connection, DatabaseMetadata } from '@contember/database';
5
4
  export interface SystemMigrationArgs {
6
5
  schemaResolver: (connection: Connection.ConnectionLike) => Promise<Schema>;
7
- databaseMetadataResolver: (connection: Connection.ConnectionLike, schema: string) => Promise<SchemaDatabaseMetadata>;
6
+ databaseMetadataResolver: (connection: Connection.ConnectionLike, schema: string) => Promise<DatabaseMetadata>;
8
7
  project: ProjectConfig;
9
8
  }
10
9
  //# sourceMappingURL=types.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/migrations/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAA;AAEhE,MAAM,WAAW,mBAAmB;IACnC,cAAc,EAAE,CAAC,UAAU,EAAE,UAAU,CAAC,cAAc,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;IAC1E,wBAAwB,EAAE,CAAC,UAAU,EAAE,UAAU,CAAC,cAAc,EAAE,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,sBAAsB,CAAC,CAAA;IACpH,OAAO,EAAE,aAAa,CAAA;CACtB"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/migrations/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AACxC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AAElE,MAAM,WAAW,mBAAmB;IACnC,cAAc,EAAE,CAAC,UAAU,EAAE,UAAU,CAAC,cAAc,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;IAC1E,wBAAwB,EAAE,CAAC,UAAU,EAAE,UAAU,CAAC,cAAc,EAAE,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAA;IAC9G,OAAO,EAAE,aAAa,CAAA;CACtB"}
@@ -1,14 +1,14 @@
1
1
  import { ProjectConfig } from '../types';
2
2
  import { StageCreator } from './stages';
3
- import { DatabaseContextFactory } from './database';
3
+ import { DatabaseContext } from './database';
4
4
  import { Logger } from '@contember/logger';
5
5
  import { SystemMigrationsRunner } from '../migrations';
6
6
  export declare class ProjectInitializer {
7
7
  private readonly stageCreator;
8
8
  private readonly migrationsRunner;
9
- private readonly databaseContextFactory;
9
+ private readonly databaseContext;
10
10
  private readonly project;
11
- constructor(stageCreator: StageCreator, migrationsRunner: SystemMigrationsRunner, databaseContextFactory: DatabaseContextFactory, project: ProjectConfig);
11
+ constructor(stageCreator: StageCreator, migrationsRunner: SystemMigrationsRunner, databaseContext: DatabaseContext, project: ProjectConfig);
12
12
  initialize(logger: Logger): Promise<void>;
13
13
  private initStages;
14
14
  }
@@ -1 +1 @@
1
- {"version":3,"file":"ProjectInitializer.d.ts","sourceRoot":"","sources":["../../../src/model/ProjectInitializer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AACvC,OAAO,EAAmB,sBAAsB,EAAE,MAAM,YAAY,CAAA;AAEpE,OAAO,EAA8B,MAAM,EAAE,MAAM,mBAAmB,CAAA;AACtE,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAA;AAEtD,qBAAa,kBAAkB;IAE7B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,sBAAsB;IACvC,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAHP,YAAY,EAAE,YAAY,EAC1B,gBAAgB,EAAE,sBAAsB,EACxC,sBAAsB,EAAE,sBAAsB,EAC9C,OAAO,EAAE,aAAa;IAG3B,UAAU,CAAC,MAAM,EAAE,MAAM;YAiBxB,UAAU;CAWxB"}
1
+ {"version":3,"file":"ProjectInitializer.d.ts","sourceRoot":"","sources":["../../../src/model/ProjectInitializer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAE5C,OAAO,EAA8B,MAAM,EAAE,MAAM,mBAAmB,CAAA;AACtE,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAA;AAEtD,qBAAa,kBAAkB;IAE7B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAHP,YAAY,EAAE,YAAY,EAC1B,gBAAgB,EAAE,sBAAsB,EACxC,eAAe,EAAE,eAAe,EAChC,OAAO,EAAE,aAAa;IAG3B,UAAU,CAAC,MAAM,EAAE,MAAM;YAiBxB,UAAU;CAWxB"}
@@ -4,17 +4,17 @@ exports.ProjectInitializer = void 0;
4
4
  const database_1 = require("@contember/database");
5
5
  const logger_1 = require("@contember/logger");
6
6
  class ProjectInitializer {
7
- constructor(stageCreator, migrationsRunner, databaseContextFactory, project) {
7
+ constructor(stageCreator, migrationsRunner, databaseContext, project) {
8
8
  this.stageCreator = stageCreator;
9
9
  this.migrationsRunner = migrationsRunner;
10
- this.databaseContextFactory = databaseContextFactory;
10
+ this.databaseContext = databaseContext;
11
11
  this.project = project;
12
12
  }
13
13
  async initialize(logger) {
14
14
  return await logger.scope(async (initLogger) => {
15
15
  initLogger.debug('Executing system schema migrations');
16
16
  await this.migrationsRunner.run(initLogger);
17
- const dbContext = this.databaseContextFactory.create();
17
+ const dbContext = this.databaseContext;
18
18
  await (0, database_1.retryTransaction)(() => dbContext.transaction(async (trx) => {
19
19
  await this.initStages(trx, logger);
20
20
  }), message => initLogger.warn(message));
@@ -1 +1 @@
1
- {"version":3,"file":"ProjectInitializer.js","sourceRoot":"","sources":["../../../src/model/ProjectInitializer.ts"],"names":[],"mappings":";;;AAGA,kDAAkE;AAClE,8CAAsE;AAGtE,MAAa,kBAAkB;IAC9B,YACkB,YAA0B,EAC1B,gBAAwC,EACxC,sBAA8C,EAC9C,OAAsB;QAHtB,iBAAY,GAAZ,YAAY,CAAc;QAC1B,qBAAgB,GAAhB,gBAAgB,CAAwB;QACxC,2BAAsB,GAAtB,sBAAsB,CAAwB;QAC9C,YAAO,GAAP,OAAO,CAAe;IACrC,CAAC;IAEG,KAAK,CAAC,UAAU,CAAC,MAAc;QACrC,OAAO,MAAM,MAAM,CAAC,KAAK,CAAC,KAAK,EAAC,UAAU,EAAC,EAAE;YAC5C,UAAU,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAA;YACtD,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;YAC3C,MAAM,SAAS,GAAG,IAAI,CAAC,sBAAsB,CAAC,MAAM,EAAE,CAAA;YACtD,MAAM,IAAA,2BAAgB,EACrB,GAAG,EAAE,CAAC,SAAS,CAAC,WAAW,CAAC,KAAK,EAAC,GAAG,EAAC,EAAE;gBACvC,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;YACnC,CAAC,CAAC,EACF,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CACnC,CAAA;YACD,IAAI,SAAS,CAAC,MAAM,CAAC,UAAU,YAAY,qBAAU,EAAE;gBACtD,MAAM,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,SAAS,EAAE,CAAA;aAC7C;QACF,CAAC,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,mCAA0B,CAAC,OAAO,EAAE,EAAE,CAAC,CAAA;IAC1D,CAAC;IAEO,KAAK,CAAC,UAAU,CAAC,EAA+C,EAAE,MAAc;QACvF,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAA;QAC/B,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;YACxC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,EAAE,EAAE,KAAK,CAAC,CAAA;YAC9D,IAAI,OAAO,EAAE;gBACZ,MAAM,CAAC,IAAI,CAAC,iBAAiB,KAAK,CAAC,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,CAAA;aACjE;iBAAM;gBACN,MAAM,CAAC,KAAK,CAAC,iBAAiB,KAAK,CAAC,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,CAAA;aAClE;SACD;IACF,CAAC;CACD;AApCD,gDAoCC"}
1
+ {"version":3,"file":"ProjectInitializer.js","sourceRoot":"","sources":["../../../src/model/ProjectInitializer.ts"],"names":[],"mappings":";;;AAGA,kDAAkE;AAClE,8CAAsE;AAGtE,MAAa,kBAAkB;IAC9B,YACkB,YAA0B,EAC1B,gBAAwC,EACxC,eAAgC,EAChC,OAAsB;QAHtB,iBAAY,GAAZ,YAAY,CAAc;QAC1B,qBAAgB,GAAhB,gBAAgB,CAAwB;QACxC,oBAAe,GAAf,eAAe,CAAiB;QAChC,YAAO,GAAP,OAAO,CAAe;IACrC,CAAC;IAEG,KAAK,CAAC,UAAU,CAAC,MAAc;QACrC,OAAO,MAAM,MAAM,CAAC,KAAK,CAAC,KAAK,EAAC,UAAU,EAAC,EAAE;YAC5C,UAAU,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAA;YACtD,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;YAC3C,MAAM,SAAS,GAAG,IAAI,CAAC,eAAe,CAAA;YACtC,MAAM,IAAA,2BAAgB,EACrB,GAAG,EAAE,CAAC,SAAS,CAAC,WAAW,CAAC,KAAK,EAAC,GAAG,EAAC,EAAE;gBACvC,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;YACnC,CAAC,CAAC,EACF,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CACnC,CAAA;YACD,IAAI,SAAS,CAAC,MAAM,CAAC,UAAU,YAAY,qBAAU,EAAE;gBACtD,MAAM,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,SAAS,EAAE,CAAA;aAC7C;QACF,CAAC,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,mCAA0B,CAAC,OAAO,EAAE,EAAE,CAAC,CAAA;IAC1D,CAAC;IAEO,KAAK,CAAC,UAAU,CAAC,EAA+C,EAAE,MAAc;QACvF,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAA;QAC/B,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;YACxC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,EAAE,EAAE,KAAK,CAAC,CAAA;YAC9D,IAAI,OAAO,EAAE;gBACZ,MAAM,CAAC,IAAI,CAAC,iBAAiB,KAAK,CAAC,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,CAAA;aACjE;iBAAM;gBACN,MAAM,CAAC,KAAK,CAAC,iBAAiB,KAAK,CAAC,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,CAAA;aAClE;SACD;IACF,CAAC;CACD;AApCD,gDAoCC"}
@@ -12,9 +12,8 @@ export interface DatabaseContext<ConnectionType extends Connection.ConnectionLik
12
12
  }
13
13
  export declare class DatabaseContextFactory {
14
14
  readonly schemaName: string;
15
- private readonly connection;
16
15
  private readonly providers;
17
- constructor(schemaName: string, connection: Connection, providers: UuidProvider);
18
- create(connection?: Connection.ConnectionLike): DatabaseContext;
16
+ constructor(schemaName: string, providers: UuidProvider);
17
+ create(connection: Connection.ConnectionLike): DatabaseContext;
19
18
  }
20
19
  //# sourceMappingURL=DatabaseContext.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"DatabaseContext.d.ts","sourceRoot":"","sources":["../../../../src/model/database/DatabaseContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAC3E,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAExC,MAAM,WAAW,eAAe,CAAC,cAAc,SAAS,UAAU,CAAC,cAAc,GAAG,UAAU,CAAC,cAAc;IAC5G,MAAM,EAAE,MAAM,CAAC,cAAc,CAAC,CAAA;IAC9B,YAAY,EAAE,YAAY,CAAC,iBAAiB,CAAC,CAAA;IAC7C,WAAW,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,eAAe,CAAC,UAAU,CAAC,eAAe,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAA;IACvG,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,eAAe,CAAC,cAAc,GAAG,UAAU,CAAC,sBAAsB,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAA;IACzH,MAAM,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,eAAe,CAAC,UAAU,CAAC,cAAc,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAA;IAC/G,UAAU,EAAE,UAAU,CAAA;CACtB;AAED,qBAAa,sBAAsB;aAEjB,UAAU,EAAE,MAAM;IAClC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAFV,UAAU,EAAE,MAAM,EACjB,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,YAAY;IAGlC,MAAM,CAAC,UAAU,CAAC,EAAE,UAAU,CAAC,cAAc,GAAG,eAAe;CAItE"}
1
+ {"version":3,"file":"DatabaseContext.d.ts","sourceRoot":"","sources":["../../../../src/model/database/DatabaseContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAC3E,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAExC,MAAM,WAAW,eAAe,CAAC,cAAc,SAAS,UAAU,CAAC,cAAc,GAAG,UAAU,CAAC,cAAc;IAC5G,MAAM,EAAE,MAAM,CAAC,cAAc,CAAC,CAAA;IAC9B,YAAY,EAAE,YAAY,CAAC,iBAAiB,CAAC,CAAA;IAC7C,WAAW,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,eAAe,CAAC,UAAU,CAAC,eAAe,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAA;IACvG,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,eAAe,CAAC,cAAc,GAAG,UAAU,CAAC,sBAAsB,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAA;IACzH,MAAM,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,eAAe,CAAC,UAAU,CAAC,cAAc,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAA;IAC/G,UAAU,EAAE,UAAU,CAAA;CACtB;AAED,qBAAa,sBAAsB;aAEjB,UAAU,EAAE,MAAM;IAClC,OAAO,CAAC,QAAQ,CAAC,SAAS;gBADV,UAAU,EAAE,MAAM,EACjB,SAAS,EAAE,YAAY;IAGlC,MAAM,CAAC,UAAU,EAAE,UAAU,CAAC,cAAc,GAAG,eAAe;CAIrE"}
@@ -4,13 +4,12 @@ exports.DatabaseContextFactory = void 0;
4
4
  const database_1 = require("@contember/database");
5
5
  const commands_1 = require("../commands");
6
6
  class DatabaseContextFactory {
7
- constructor(schemaName, connection, providers) {
7
+ constructor(schemaName, providers) {
8
8
  this.schemaName = schemaName;
9
- this.connection = connection;
10
9
  this.providers = providers;
11
10
  }
12
11
  create(connection) {
13
- const client = new database_1.Client(connection !== null && connection !== void 0 ? connection : this.connection, this.schemaName, { module: 'system' });
12
+ const client = new database_1.Client(connection, this.schemaName, { module: 'system' });
14
13
  return createDatabaseContext(client, this.providers);
15
14
  }
16
15
  }
@@ -1 +1 @@
1
- {"version":3,"file":"DatabaseContext.js","sourceRoot":"","sources":["../../../../src/model/database/DatabaseContext.ts"],"names":[],"mappings":";;;AAAA,kDAA2E;AAG3E,0CAAwC;AAWxC,MAAa,sBAAsB;IAClC,YACiB,UAAkB,EACjB,UAAsB,EACtB,SAAuB;QAFxB,eAAU,GAAV,UAAU,CAAQ;QACjB,eAAU,GAAV,UAAU,CAAY;QACtB,cAAS,GAAT,SAAS,CAAc;IACtC,CAAC;IAEG,MAAM,CAAC,UAAsC;QACnD,MAAM,MAAM,GAAG,IAAI,iBAAM,CAAC,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAA;QAC/F,OAAO,qBAAqB,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;IACrD,CAAC;CACD;AAXD,wDAWC;AAED,MAAM,qBAAqB,GAAG,CAC7B,MAA8B,EAC9B,SAAuB,EACW,EAAE,CAAC,CAAC;IACtC,MAAM;IACN,YAAY,EAAE,MAAM,CAAC,kBAAkB,EAAE;IACzC,WAAW,EAAE,EAAE,CAAC,EAAE,CACjB,MAAM,CAAC,WAAW,CAAC,KAAK,EAAC,MAAM,EAAC,EAAE;QACjC,MAAM,MAAM,CAAC,KAAK,CAAC,qBAAU,CAAC,eAAe,CAAC,CAAA;QAC9C,OAAO,EAAE,CAAC,qBAAqB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAA;IACpD,CAAC,CAAC;IACH,KAAK,EAAE,EAAE,CAAC,EAAE,CACX,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,qBAAqB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;IACrE,UAAU,EAAE,IAAI,qBAAU,CAAC,MAAM,EAAE,SAAS,CAAC;IAC7C,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,qBAAqB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;CACjG,CAAC,CAAA"}
1
+ {"version":3,"file":"DatabaseContext.js","sourceRoot":"","sources":["../../../../src/model/database/DatabaseContext.ts"],"names":[],"mappings":";;;AAAA,kDAA2E;AAG3E,0CAAwC;AAWxC,MAAa,sBAAsB;IAClC,YACiB,UAAkB,EACjB,SAAuB;QADxB,eAAU,GAAV,UAAU,CAAQ;QACjB,cAAS,GAAT,SAAS,CAAc;IACtC,CAAC;IAEG,MAAM,CAAC,UAAqC;QAClD,MAAM,MAAM,GAAG,IAAI,iBAAM,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAA;QAC5E,OAAO,qBAAqB,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;IACrD,CAAC;CACD;AAVD,wDAUC;AAED,MAAM,qBAAqB,GAAG,CAC7B,MAA8B,EAC9B,SAAuB,EACW,EAAE,CAAC,CAAC;IACtC,MAAM;IACN,YAAY,EAAE,MAAM,CAAC,kBAAkB,EAAE;IACzC,WAAW,EAAE,EAAE,CAAC,EAAE,CACjB,MAAM,CAAC,WAAW,CAAC,KAAK,EAAC,MAAM,EAAC,EAAE;QACjC,MAAM,MAAM,CAAC,KAAK,CAAC,qBAAU,CAAC,eAAe,CAAC,CAAA;QAC9C,OAAO,EAAE,CAAC,qBAAqB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAA;IACpD,CAAC,CAAC;IACH,KAAK,EAAE,EAAE,CAAC,EAAE,CACX,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,qBAAqB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;IACrE,UAAU,EAAE,IAAI,qBAAU,CAAC,MAAM,EAAE,SAAS,CAAC;IAC7C,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,qBAAqB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;CACjG,CAAC,CAAA"}
@@ -1,17 +1,16 @@
1
- import { SchemaDatabaseMetadata } from '@contember/schema-utils';
2
- import { SchemaDatabaseMetadataResolver } from './SchemaDatabaseMetadataResolver';
3
1
  import { DatabaseContext } from '../database';
2
+ import { DatabaseMetadata, DatabaseMetadataResolver } from '@contember/database';
4
3
  export declare class SchemaDatabaseMetadataResolverStore {
5
4
  private resolver;
6
5
  private db;
7
6
  private cache;
8
- constructor(resolver: SchemaDatabaseMetadataResolver, db: DatabaseContext);
9
- getMetadata(schema: string): Promise<SchemaDatabaseMetadata>;
7
+ constructor(resolver: DatabaseMetadataResolver, db: DatabaseContext);
8
+ getMetadata(schema: string): Promise<DatabaseMetadata>;
10
9
  invalidate(schema: string): void;
11
10
  }
12
11
  export declare class MigrationsDatabaseMetadataResolverStoreFactory {
13
12
  private resolver;
14
- constructor(resolver: SchemaDatabaseMetadataResolver);
13
+ constructor(resolver: DatabaseMetadataResolver);
15
14
  create(db: DatabaseContext): SchemaDatabaseMetadataResolverStore;
16
15
  }
17
16
  //# sourceMappingURL=SchemaDatabaseMetadataResolverStore.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"SchemaDatabaseMetadataResolverStore.d.ts","sourceRoot":"","sources":["../../../../src/model/metadata/SchemaDatabaseMetadataResolverStore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAA;AAChE,OAAO,EAAE,8BAA8B,EAAE,MAAM,kCAAkC,CAAA;AACjF,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAE7C,qBAAa,mCAAmC;IAK9C,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,EAAE;IAJX,OAAO,CAAC,KAAK,CAAiD;gBAGrD,QAAQ,EAAE,8BAA8B,EACxC,EAAE,EAAE,eAAe;IAIf,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAWlE,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;CAGvC;AAGD,qBAAa,8CAA8C;IAEzD,OAAO,CAAC,QAAQ;gBAAR,QAAQ,EAAE,8BAA8B;IAI1C,MAAM,CAAC,EAAE,EAAE,eAAe;CAGjC"}
1
+ {"version":3,"file":"SchemaDatabaseMetadataResolverStore.d.ts","sourceRoot":"","sources":["../../../../src/model/metadata/SchemaDatabaseMetadataResolverStore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAC7C,OAAO,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAA;AAEhF,qBAAa,mCAAmC;IAK9C,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,EAAE;IAJX,OAAO,CAAC,KAAK,CAA2C;gBAG/C,QAAQ,EAAE,wBAAwB,EAClC,EAAE,EAAE,eAAe;IAIf,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAW5D,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;CAGvC;AAGD,qBAAa,8CAA8C;IAEzD,OAAO,CAAC,QAAQ;gBAAR,QAAQ,EAAE,wBAAwB;IAIpC,MAAM,CAAC,EAAE,EAAE,eAAe;CAGjC"}
@@ -12,7 +12,7 @@ class SchemaDatabaseMetadataResolverStore {
12
12
  if (cached) {
13
13
  return cached;
14
14
  }
15
- const newValue = await this.resolver.resolveMetadata(this.db, schema);
15
+ const newValue = await this.resolver.resolveMetadata(this.db.client, schema);
16
16
  this.cache.set(schema, newValue);
17
17
  return newValue;
18
18
  }
@@ -1 +1 @@
1
- {"version":3,"file":"SchemaDatabaseMetadataResolverStore.js","sourceRoot":"","sources":["../../../../src/model/metadata/SchemaDatabaseMetadataResolverStore.ts"],"names":[],"mappings":";;;AAIA,MAAa,mCAAmC;IAI/C,YACS,QAAwC,EACxC,EAAmB;QADnB,aAAQ,GAAR,QAAQ,CAAgC;QACxC,OAAE,GAAF,EAAE,CAAiB;QAJpB,UAAK,GAAwC,IAAI,GAAG,EAAE,CAAA;IAM9D,CAAC;IAEM,KAAK,CAAC,WAAW,CAAC,MAAc;QACtC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;QACrC,IAAI,MAAM,EAAE;YACX,OAAO,MAAM,CAAA;SACb;QAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC,CAAA;QACrE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;QAChC,OAAO,QAAQ,CAAA;IAChB,CAAC;IAEM,UAAU,CAAC,MAAc;QAC/B,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;IAC1B,CAAC;CACD;AAxBD,kFAwBC;AAGD,MAAa,8CAA8C;IAC1D,YACS,QAAwC;QAAxC,aAAQ,GAAR,QAAQ,CAAgC;IAEjD,CAAC;IAEM,MAAM,CAAC,EAAmB;QAChC,OAAO,IAAI,mCAAmC,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAA;IAClE,CAAC;CACD;AATD,wGASC"}
1
+ {"version":3,"file":"SchemaDatabaseMetadataResolverStore.js","sourceRoot":"","sources":["../../../../src/model/metadata/SchemaDatabaseMetadataResolverStore.ts"],"names":[],"mappings":";;;AAGA,MAAa,mCAAmC;IAI/C,YACS,QAAkC,EAClC,EAAmB;QADnB,aAAQ,GAAR,QAAQ,CAA0B;QAClC,OAAE,GAAF,EAAE,CAAiB;QAJpB,UAAK,GAAkC,IAAI,GAAG,EAAE,CAAA;IAMxD,CAAC;IAEM,KAAK,CAAC,WAAW,CAAC,MAAc;QACtC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;QACrC,IAAI,MAAM,EAAE;YACX,OAAO,MAAM,CAAA;SACb;QAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;QAC5E,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;QAChC,OAAO,QAAQ,CAAA;IAChB,CAAC;IAEM,UAAU,CAAC,MAAc;QAC/B,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;IAC1B,CAAC;CACD;AAxBD,kFAwBC;AAGD,MAAa,8CAA8C;IAC1D,YACS,QAAkC;QAAlC,aAAQ,GAAR,QAAQ,CAA0B;IAE3C,CAAC;IAEM,MAAM,CAAC,EAAmB;QAChC,OAAO,IAAI,mCAAmC,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAA;IAClE,CAAC;CACD;AATD,wGASC"}
@@ -1,4 +1,2 @@
1
- export * from './SchemaDatabaseMetadataResolver';
2
1
  export * from './SchemaDatabaseMetadataResolverStore';
3
- export { ResolvedDatabaseMetadata } from './ResolvedDatabaseMetadata';
4
2
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/model/metadata/index.ts"],"names":[],"mappings":"AAAA,cAAc,kCAAkC,CAAA;AAChD,cAAc,uCAAuC,CAAA;AACrD,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAA"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/model/metadata/index.ts"],"names":[],"mappings":"AAAA,cAAc,uCAAuC,CAAA"}
@@ -14,9 +14,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
14
14
  for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
15
15
  };
16
16
  Object.defineProperty(exports, "__esModule", { value: true });
17
- exports.ResolvedDatabaseMetadata = void 0;
18
- __exportStar(require("./SchemaDatabaseMetadataResolver"), exports);
19
17
  __exportStar(require("./SchemaDatabaseMetadataResolverStore"), exports);
20
- var ResolvedDatabaseMetadata_1 = require("./ResolvedDatabaseMetadata");
21
- Object.defineProperty(exports, "ResolvedDatabaseMetadata", { enumerable: true, get: function () { return ResolvedDatabaseMetadata_1.ResolvedDatabaseMetadata; } });
22
18
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/model/metadata/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,mEAAgD;AAChD,wEAAqD;AACrD,uEAAqE;AAA5D,oIAAA,wBAAwB,OAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/model/metadata/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wEAAqD"}