@contember/engine-system-api 1.1.0-alpha.0 → 1.1.0-alpha.3

package/package.json

@@ -1,31 +1,31 @@
 {
   "name": "@contember/engine-system-api",
-  "version": "1.1.0-alpha.0",
+  "version": "1.1.0-alpha.3",
   "license": "Apache-2.0",
   "main": "dist/src/index.js",
   "typings": "dist/src/index.d.ts",
   "scripts": {
     "generate": "gql-gen --config graphql.codegen.yml",
-    "test": "uvu dist/tests/cases/ \\.js$ && uvu migrations \\.test\\.js"
+    "test": "uvu dist/tests/cases/ \\\\.js$"
   },
   "dependencies": {
-    "@contember/authorization": "^1.1.0-alpha.0",
-    "@contember/database": "^1.1.0-alpha.0",
-    "@contember/database-migrations": "^1.1.0-alpha.0",
-    "@contember/dic": "^1.1.0-alpha.0",
-    "@contember/engine-common": "^1.1.0-alpha.0",
-    "@contember/graphql-utils": "^1.1.0-alpha.0",
-    "@contember/queryable": "^1.1.0-alpha.0",
-    "@contember/schema": "^1.1.0-alpha.0",
-    "@contember/schema-migrations": "^1.1.0-alpha.0",
-    "@contember/schema-utils": "^1.1.0-alpha.0",
+    "@contember/authorization": "^1.1.0-alpha.3",
+    "@contember/database": "^1.1.0-alpha.3",
+    "@contember/database-migrations": "^1.1.0-alpha.3",
+    "@contember/dic": "^1.1.0-alpha.3",
+    "@contember/engine-common": "^1.1.0-alpha.3",
+    "@contember/graphql-utils": "^1.1.0-alpha.3",
+    "@contember/queryable": "^1.1.0-alpha.3",
+    "@contember/schema": "^1.1.0-alpha.3",
+    "@contember/schema-migrations": "^1.1.0-alpha.3",
+    "@contember/schema-utils": "^1.1.0-alpha.3",
     "@graphql-tools/utils": "^7.10.0",
     "apollo-server-errors": "^2.4.0",
     "graphql-tag": "^2.12.5"
   },
   "devDependencies": {
-    "@contember/engine-api-tester": "^1.1.0-alpha.0",
-    "@contember/schema-definition": "^1.1.0-alpha.0",
+    "@contember/engine-api-tester": "^1.1.0-alpha.3",
+    "@contember/schema-definition": "^1.1.0-alpha.3",
     "@graphql-codegen/cli": "^1.15.2",
     "@graphql-codegen/typescript": "^1.15.2",
     "@graphql-codegen/typescript-operations": "^1.15.2",
@@ -33,7 +33,7 @@
     "@types/node": "^17.0.5",
     "graphql": "^15.4.0",
     "pg": "^8.5.0",
-    "uvu": "^0.5.1"
+    "uvu": "^0.5.3"
   },
   "peerDependencies": {
     "graphql": ">= 14.6.0",

package/src/SystemContainer.ts

@@ -7,14 +7,12 @@ import {
 	SchemaMigrator,
 } from '@contember/schema-migrations'
 import { MigrationsRunner } from '@contember/database-migrations'
-import { DatabaseCredentials } from '@contember/database'
+import { Connection } from '@contember/database'
 import {
-	EntitiesSelector,
 	EventResponseBuilder,
 	ExecutedMigrationsResolver,
 	IdentityFetcher,
 	MigrationAlterer,
-	MigrationExecutor,
 	PermissionsFactory,
 	ProjectInitializer,
 	ProjectMigrator,
@@ -28,35 +26,35 @@ import {
 	ExecutedMigrationsQueryResolver,
 	MigrateMutationResolver,
 	MigrationAlterMutationResolver,
-	ResolverContextFactory,
 	ResolverFactory,
 	StagesQueryResolver,
+	SystemResolverContextFactory,
 	TruncateMutationResolver,
 } from './resolvers'
-import { ClientBase } from 'pg'
-import { MigrationArgs } from './migrations'
+import { getSystemMigrations, SystemMigrationArgs } from './migrations'
 import { EventOldValuesResolver } from './resolvers/types'
 
 export interface SystemContainer {
 	systemResolversFactory: ResolverFactory
 	authorizator: Authorizator
-	resolverContextFactory: ResolverContextFactory
+	resolverContextFactory: SystemResolverContextFactory
 	schemaVersionBuilder: SchemaVersionBuilder
 	projectInitializer: ProjectInitializer
-	systemDbMigrationsRunnerFactory: SystemDbMigrationsRunnerFactory
 }
 
-export type SystemDbMigrationsRunnerFactory = (db: DatabaseCredentials, dbClient: ClientBase) => MigrationsRunner<MigrationArgs>
+export type SystemDbMigrationsRunnerFactory = (db: Connection.ConnectionLike, schema: string) => MigrationsRunner<SystemMigrationArgs>
 
 type Args = {
-	providers: UuidProvider
-	modificationHandlerFactory: ModificationHandlerFactory
-	entitiesSelector: EntitiesSelector
-	systemDbMigrationsRunnerFactory: (db: DatabaseCredentials, dbClient: ClientBase) => MigrationsRunner<MigrationArgs>
 	identityFetcher: IdentityFetcher
 }
 
 export class SystemContainerFactory {
+	constructor(
+		private readonly providers: UuidProvider,
+		private readonly modificationHandlerFactory: ModificationHandlerFactory,
+	) {
+	}
+
 	public create(container: Args): Container<SystemContainer> {
 		return this.createBuilder(container)
 			.build()
@@ -66,33 +64,30 @@ export class SystemContainerFactory {
 				'resolverContextFactory',
 				'schemaVersionBuilder',
 				'projectInitializer',
-				'systemDbMigrationsRunnerFactory',
 			)
 	}
-	public createBuilder(container: Args) {
+	public createBuilder({ identityFetcher }: Args) {
 		return new Builder({})
-			.addService('systemDbMigrationsRunnerFactory', () =>
-				container.systemDbMigrationsRunnerFactory)
+			.addService('providers', () =>
+				this.providers)
 			.addService('modificationHandlerFactory', () =>
-				container.modificationHandlerFactory)
+				this.modificationHandlerFactory)
 			.addService('identityFetcher', () =>
-				container.identityFetcher)
+				identityFetcher)
+			.addService('systemDbMigrationsRunnerFactory', (): SystemDbMigrationsRunnerFactory =>
+				(db, schema) => new MigrationsRunner(db, schema, getSystemMigrations))
 			.addService('schemaMigrator', ({ modificationHandlerFactory }) =>
 				new SchemaMigrator(modificationHandlerFactory))
 			.addService('executedMigrationsResolver', ({}) =>
 				new ExecutedMigrationsResolver())
 			.addService('schemaVersionBuilder', ({ executedMigrationsResolver, schemaMigrator }) =>
 				new SchemaVersionBuilder(executedMigrationsResolver, schemaMigrator))
-			.addService('providers', () =>
-				container.providers)
 			.addService('accessEvaluator', ({}) =>
 				new AccessEvaluator.PermissionEvaluator(new PermissionsFactory().create()))
 			.addService('authorizator', ({ accessEvaluator }): Authorizator =>
 				new Authorizator.Default(accessEvaluator))
 			.addService('schemaDiffer', ({ schemaMigrator }) =>
 				new SchemaDiffer(schemaMigrator))
-			.addService('migrationExecutor', ({ modificationHandlerFactory }) =>
-				new MigrationExecutor(modificationHandlerFactory))
 			.addService('migrationDescriber', ({ modificationHandlerFactory }) =>
 				new MigrationDescriber(modificationHandlerFactory))
 			.addService('projectMigrator', ({ migrationDescriber, schemaVersionBuilder, executedMigrationsResolver }) =>
@@ -115,6 +110,8 @@ export class SystemContainerFactory {
 				new TruncateMutationResolver(projectTruncateExecutor))
 			.addService('migrationAlterMutationResolver', ({ migrationAlterer }) =>
 				new MigrationAlterMutationResolver(migrationAlterer))
+			.addService('projectInitializer', ({ projectMigrator, stageCreator, systemDbMigrationsRunnerFactory, schemaVersionBuilder }) =>
+				new ProjectInitializer(projectMigrator, stageCreator, systemDbMigrationsRunnerFactory, schemaVersionBuilder))
 			.addService('eventsQueryResolver', ({ eventResponseBuilder }) =>
 				new EventsQueryResolver(eventResponseBuilder))
 			.addService('eventOldValuesResolver', () =>
@@ -122,9 +119,6 @@ export class SystemContainerFactory {
 			.addService('systemResolversFactory', ({ stagesQueryResolver, executedMigrationsQueryResolver, migrateMutationResolver, truncateMutationResolver, migrationAlterMutationResolver, eventsQueryResolver, eventOldValuesResolver }) =>
 				new ResolverFactory(stagesQueryResolver, executedMigrationsQueryResolver, migrateMutationResolver, truncateMutationResolver, migrationAlterMutationResolver, eventsQueryResolver, eventOldValuesResolver))
 			.addService('resolverContextFactory', ({ authorizator, schemaVersionBuilder }) =>
-				new ResolverContextFactory(authorizator, schemaVersionBuilder))
-			.addService('projectInitializer', ({ projectMigrator, stageCreator, systemDbMigrationsRunnerFactory, schemaVersionBuilder }) =>
-				new ProjectInitializer(projectMigrator, stageCreator, systemDbMigrationsRunnerFactory, schemaVersionBuilder),
-			)
+				new SystemResolverContextFactory(authorizator, schemaVersionBuilder))
 	}
 }

package/src/index.ts

@@ -17,6 +17,7 @@ export {
 	ProjectMigrator,
 	StageCreator,
 	getJunctionTables,
+	Stage,
 } from './model'
 export * from './SystemContainer'
 export * from './resolvers'

package/{migrations → src/migrations}/2018-08-04-102200-init.sql

@@ -2,27 +2,27 @@ CREATE DOMAIN "event_type" AS TEXT CHECK (
   VALUE IN ('init', 'create', 'update', 'delete', 'run_migration')
 );
 
-CREATE TABLE "system"."event" (
+CREATE TABLE "event" (
   "id" uuid PRIMARY KEY NOT NULL,
   "type" event_type NOT NULL,
   "data" jsonb NOT NULL,
-  "previous_id" uuid DEFAULT NULL REFERENCES "system"."event"("id") ON DELETE RESTRICT,
+  "previous_id" uuid DEFAULT NULL REFERENCES "event"("id") ON DELETE RESTRICT,
   "created_at" timestamp NOT NULL DEFAULT now(),
   "identity_id" uuid NOT NULL DEFAULT current_setting('tenant.identity_id')::uuid,
   CONSTRAINT "previous_id_not_null" CHECK ("previous_id" IS NOT NULL OR "type" = 'init'),
   CONSTRAINT "unique_init" EXCLUDE ("type" WITH =) WHERE ("type" = 'init')
 );
-CREATE INDEX "system_event_type" ON "system"."event" USING HASH ("type"); -- TODO: Does this make sense?
-CREATE INDEX "system_event_previous_id" ON "system"."event"("previous_id");
-CREATE INDEX "system_event_data_table_name" ON "system"."event"(("data"->>'tableName'))
+CREATE INDEX "system_event_type" ON "event" USING HASH ("type"); -- TODO: Does this make sense?
+CREATE INDEX "system_event_previous_id" ON "event"("previous_id");
+CREATE INDEX "system_event_data_table_name" ON "event"(("data"->>'tableName'))
   WHERE "type" IN ('create', 'update', 'delete');
-CREATE INDEX "system_event_data_row_id" ON "system"."event"(("data"->>'rowId'))
+CREATE INDEX "system_event_data_row_id" ON "event"(("data"->>'rowId'))
   WHERE "type" IN ('create', 'update', 'delete');
 
-CREATE TABLE "system"."stage" (
+CREATE TABLE "stage" (
   "id" uuid PRIMARY KEY NOT NULL,
   "name" text NOT NULL,
   "slug" text NOT NULL UNIQUE,
-  "event_id" uuid NOT NULL REFERENCES "system"."event"("id") ON DELETE RESTRICT
+  "event_id" uuid NOT NULL REFERENCES "event"("id") ON DELETE RESTRICT
 );
-CREATE INDEX "system_stage_event_id" ON "system"."stage"("event_id");
+CREATE INDEX "system_stage_event_id" ON "stage"("event_id");

package/{migrations → src/migrations}/2018-08-05-130501-trigger-event-function.sql

@@ -5,9 +5,9 @@ $BLOCK$
           SELECT
           FROM pg_proc
                    JOIN pg_namespace ON pg_proc.pronamespace = pg_namespace.oid
-          WHERE pg_namespace.nspname = 'system' AND pg_proc.proname = 'uuid_generate_v4'
+          WHERE pg_namespace.nspname in(current_schema(), 'pg_catalog') AND pg_proc.proname = 'uuid_generate_v4'
             ) THEN
-            CREATE FUNCTION "system"."uuid_generate_v4"() RETURNS UUID
+            CREATE FUNCTION "uuid_generate_v4"() RETURNS UUID
             AS
             $$
             SELECT OVERLAY(OVERLAY(md5(random()::TEXT || ':' || clock_timestamp()::TEXT) PLACING '4' FROM 13) PLACING
@@ -18,7 +18,7 @@ $BLOCK$
 $BLOCK$;
 
 
-CREATE FUNCTION "system"."make_diff"(old jsonb, new jsonb) RETURNS jsonb AS $$
+CREATE FUNCTION "make_diff"(old jsonb, new jsonb) RETURNS jsonb AS $$
 
   DECLARE col record;
   DECLARE diff jsonb := '{}'::jsonb;
@@ -36,9 +36,9 @@ CREATE FUNCTION "system"."make_diff"(old jsonb, new jsonb) RETURNS jsonb AS $$
 $$ LANGUAGE  plpgsql;
 
 
-CREATE FUNCTION "system"."trigger_event"() RETURNS TRIGGER AS $$
+CREATE FUNCTION "trigger_event"() RETURNS TRIGGER AS $$
 
-  DECLARE new_event_id uuid := system.uuid_generate_v4();
+  DECLARE new_event_id uuid := uuid_generate_v4();
   DECLARE new_event_type text;
   DECLARE new_event_data jsonb;
   DECLARE current_stage record;
@@ -58,7 +58,7 @@ CREATE FUNCTION "system"."trigger_event"() RETURNS TRIGGER AS $$
         new_event_data := jsonb_build_object(
           'tableName', TG_TABLE_NAME,
           'rowId', OLD.id::text,
-          'values', "system"."make_diff"(to_jsonb(OLD), to_jsonb(NEW))
+          'values', "make_diff"(to_jsonb(OLD), to_jsonb(NEW))
         );
 
       WHEN 'DELETE' THEN
@@ -72,15 +72,15 @@ CREATE FUNCTION "system"."trigger_event"() RETURNS TRIGGER AS $$
         RAISE EXCEPTION 'Unknown TG_OP value %', TG_OP;
     END CASE;
 
-    SELECT "id", "event_id" FROM "system"."stage"
+    SELECT "id", "event_id" FROM "stage"
     WHERE "slug" = right(TG_TABLE_SCHEMA, -length('stage_'))
     FOR NO KEY UPDATE
     INTO current_stage;
 
-    INSERT INTO "system"."event" ("id", "type", "data", "previous_id")
+    INSERT INTO "event" ("id", "type", "data", "previous_id")
     VALUES (new_event_id, new_event_type, new_event_data, current_stage.event_id);
 
-    UPDATE "system"."stage"
+    UPDATE "stage"
     SET "event_id" = new_event_id
     WHERE "id" = current_stage.id;
 

package/{migrations → src/migrations}/2019-01-14-143432-event-trx-id.sql

@@ -1,8 +1,8 @@
-ALTER TABLE "system"."event"
+ALTER TABLE "event"
 	ADD COLUMN transaction_id uuid DEFAULT NULL;
-UPDATE "system"."event"
-SET transaction_id = "system".uuid_generate_v4();
+UPDATE "event"
+SET transaction_id = uuid_generate_v4();
 
-ALTER TABLE "system"."event"
+ALTER TABLE "event"
 	ALTER "transaction_id" SET DEFAULT current_setting('system.transaction_id')::uuid,
 	ALTER "transaction_id" SET NOT NULL;

package/{migrations → src/migrations}/2019-02-04-154500-event-rebase.sql

@@ -8,22 +8,22 @@ $$
 
 WITH RECURSIVE events(id, type, data, previous_id, created_at, identity_id, transaction_id, index) AS (
 	SELECT event.id, event.type, event.data, event.previous_id, event.created_at, event.identity_id, event.transaction_id, 0
-	FROM system.event
+	FROM event
 	WHERE event.id = head AND event.id <> oldBase
 	UNION
 	SELECT event.id, event.type, event.data, event.previous_id, event.created_at, event.identity_id, event.transaction_id, index + 1
-	FROM system.event, events
+	FROM event, events
 	WHERE event.id = events.previous_id AND events.previous_id <> oldBase
 ),
 	filtered_with_ids AS (
 		SELECT event.id, event.type, event.data, event.previous_id, event.created_at, event.identity_id, event.transaction_id, 0, event.id AS new_id,
 			NULL AS new_trx_id, 0 AS number
-		FROM system.event
+		FROM event
 		WHERE id = newBase
 		UNION
 		SELECT *,
-			system.uuid_generate_v4() AS new_id,
-			system.uuid_generate_v4() AS new_trx_id,
+			uuid_generate_v4() AS new_id,
+			uuid_generate_v4() AS new_trx_id,
 			row_number() OVER (ORDER BY events.index DESC) AS number
 		FROM events
 		WHERE NOT (id = ANY (appliedEvents))
@@ -36,7 +36,7 @@ WITH RECURSIVE events(id, type, data, previous_id, created_at, identity_id, tran
 	),
 	insert AS (
 		INSERT
-			INTO system.event(id, type, data, previous_id, created_at, identity_id, transaction_id)
+			INTO event(id, type, data, previous_id, created_at, identity_id, transaction_id)
 				SELECT new_id, type, data, new_previous_id, created_at, identity_id, new_trx_id2
 				FROM with_ids_by_window
 				WHERE with_ids_by_window.number > 0 RETURNING *

package/{migrations → src/migrations}/2019-03-18-104147-event-run-migration-struct.sql

@@ -1,3 +1,3 @@
-UPDATE system.event
+UPDATE event
 SET data = jsonb_build_object('version', coalesce(substring(data ->> 'file', 0, 17), data ->> 'version'))
 WHERE type = 'run_migration';

package/{migrations → src/migrations}/2019-07-29-103000-trigger-event-function-fix.sql

@@ -1,6 +1,6 @@
-CREATE OR REPLACE FUNCTION "system"."trigger_event"() RETURNS TRIGGER AS $$
+CREATE OR REPLACE FUNCTION "trigger_event"() RETURNS TRIGGER AS $$
 
-  DECLARE new_event_id uuid := system.uuid_generate_v4();
+  DECLARE new_event_id uuid := uuid_generate_v4();
   DECLARE new_event_type text;
   DECLARE new_event_data jsonb;
   DECLARE current_stage record;
@@ -17,7 +17,7 @@ CREATE OR REPLACE FUNCTION "system"."trigger_event"() RETURNS TRIGGER AS $$
         );
 
       WHEN 'UPDATE' THEN
-        update_diff := "system"."make_diff"(to_jsonb(OLD), to_jsonb(NEW));
+        update_diff := "make_diff"(to_jsonb(OLD), to_jsonb(NEW));
         IF (SELECT count(*) FROM jsonb_object_keys(update_diff)) = 0 THEN
             RETURN NULL;
         END IF;
@@ -39,15 +39,15 @@ CREATE OR REPLACE FUNCTION "system"."trigger_event"() RETURNS TRIGGER AS $$
         RAISE EXCEPTION 'Unknown TG_OP value %', TG_OP;
     END CASE;
 
-    SELECT "id", "event_id" FROM "system"."stage"
+    SELECT "id", "event_id" FROM "stage"
     WHERE "slug" = right(TG_TABLE_SCHEMA, -length('stage_'))
     FOR NO KEY UPDATE
     INTO current_stage;
 
-    INSERT INTO "system"."event" ("id", "type", "data", "previous_id")
+    INSERT INTO "event" ("id", "type", "data", "previous_id")
     VALUES (new_event_id, new_event_type, new_event_data, current_stage.event_id);
 
-    UPDATE "system"."stage"
+    UPDATE "stage"
     SET "event_id" = new_event_id
     WHERE "id" = current_stage.id;
 

package/{migrations → src/migrations}/2019-11-28-100000-missing-setting-fallback.sql

@@ -1,4 +1,4 @@
-ALTER TABLE "system"."event"
+ALTER TABLE "event"
     ALTER COLUMN "identity_id" SET DEFAULT
         coalesce(
             current_setting('tenant.identity_id', true)::uuid,
@@ -8,5 +8,5 @@ ALTER TABLE "system"."event"
     ALTER COLUMN "transaction_id" SET DEFAULT
         coalesce(
             nullif(current_setting('system.transaction_id', true), '')::uuid,
-            set_config('system.transaction_id', "system".uuid_generate_v4()::text, true)::uuid
+            set_config('system.transaction_id', uuid_generate_v4()::text, true)::uuid
         );

package/{migrations → src/migrations}/2020-03-27-130000-project-migrations.ts

@@ -1,11 +1,10 @@
 import { MigrationBuilder } from '@contember/database-migrations'
-import { MigrationArgs } from '../'
+import { SystemMigrationArgs } from './types'
 
-export default async function (builder: MigrationBuilder, args: MigrationArgs) {
+export default async function (builder: MigrationBuilder, args: SystemMigrationArgs) {
 	builder.createTable(
 		{
 			name: 'schema_migration',
-			schema: 'system',
 		},
 		{
 			id: { notNull: true, type: 'SERIAL4' },
@@ -16,7 +15,7 @@ export default async function (builder: MigrationBuilder, args: MigrationArgs) {
 			executed_at: { notNull: true, type: 'timestamp', default: 'now()' },
 		},
 	)
-	builder.createIndex({ name: 'schema_migration', schema: 'system' }, ['version'], {
+	builder.createIndex({ name: 'schema_migration' }, ['version'], {
 		name: 'system_schema_migration_version',
 	})
 }

package/{migrations → src/migrations}/2020-05-06-150000-composed-primary.ts

@@ -1,5 +1,6 @@
 import { escapeValue, MigrationBuilder, Name } from '@contember/database-migrations'
-import { formatSchemaName, getJunctionTables, MigrationArgs } from '..'
+import { SystemMigrationArgs } from './types'
+import { getJunctionTables } from '../model'
 
 const createEventTrigger = (builder: MigrationBuilder, tableName: Name, primaryColumns: string[]) => {
 	builder.createTrigger(tableName, 'log_event', {
@@ -19,13 +20,13 @@ const migrateEvents = (builder: MigrationBuilder, tableName: string, primaryKeys
 		WITH RECURSIVE
 			recent_events(id, type, previous_id, data, created_at, stage) AS (
 				SELECT event.id, type, previous_id, data, created_at, stage.slug
-				FROM system.event
-				JOIN system.stage ON stage.event_id = event.id
+				FROM event
+				JOIN stage ON stage.event_id = event.id
 
 				UNION ALL
 
 				SELECT event.id, event.type, event.previous_id, event.data, event.created_at, recent_events.stage
-				FROM system.event, recent_events
+				FROM event, recent_events
 				WHERE event.id = recent_events.previous_id
 			),
 			affected_events AS (
@@ -55,10 +56,10 @@ const migrateEvents = (builder: MigrationBuilder, tableName: string, primaryKeys
 `)
 }
 
-export default async function (builder: MigrationBuilder, args: MigrationArgs) {
+export default async function (builder: MigrationBuilder, args: SystemMigrationArgs) {
 	const schema = await args.schemaResolver()
 	const tablesToMigrate = getJunctionTables(schema.model)
-	const schemas = args.project.stages.map(formatSchemaName)
+	const schemas = args.project.stages.map(it => `stage_${it.slug}`)
 	for (const table of tablesToMigrate) {
 		const primaryColumns: [string, string] = [table.joiningColumn.columnName, table.inverseJoiningColumn.columnName]
 		for (const schema of schemas) {
@@ -82,15 +83,15 @@ export default async function (builder: MigrationBuilder, args: MigrationArgs) {
 		}
 	}
 	builder.sql(`
-		UPDATE system.event
+		UPDATE event
 		SET data = data || jsonb_build_object('rowId', json_build_array(data ->> 'rowId'))
 		WHERE jsonb_typeof(data -> 'rowId') = 'string'
 	`)
-	builder.sql(`CREATE OR REPLACE FUNCTION "system"."trigger_event"() RETURNS TRIGGER AS
+	builder.sql(`CREATE OR REPLACE FUNCTION "trigger_event"() RETURNS TRIGGER AS
 $$
 
 DECLARE
-	new_event_id UUID := system.uuid_generate_v4();
+	new_event_id UUID := uuid_generate_v4();
 	DECLARE new_event_type TEXT;
 	DECLARE new_event_data JSONB;
 	DECLARE current_stage RECORD;
@@ -150,15 +151,15 @@ BEGIN
 		END CASE;
 
 	SELECT "id", "event_id"
-	FROM "system"."stage"
+	FROM "stage"
 	WHERE "slug" = right(TG_TABLE_SCHEMA, -length('stage_'))
 		FOR NO KEY UPDATE
 	INTO current_stage;
 
-	INSERT INTO "system"."event" ("id", "type", "data", "previous_id")
+	INSERT INTO "event" ("id", "type", "data", "previous_id")
 	VALUES (new_event_id, new_event_type, new_event_data, current_stage.event_id);
 
-	UPDATE "system"."stage"
+	UPDATE "stage"
 	SET "event_id" = new_event_id
 	WHERE "id" = current_stage.id;
 
@@ -169,7 +170,6 @@ $$ LANGUAGE plpgsql;
 `)
 	builder.dropFunction(
 		{
-			schema: 'system',
 			name: 'make_diff',
 		},
 		[

package/{migrations → src/migrations}/2020-06-01-103000-event-trigger-perf.ts

@@ -1,5 +1,6 @@
 import { MigrationBuilder, Name } from '@contember/database-migrations'
-import { formatSchemaName, getJunctionTables, MigrationArgs } from '..'
+import { SystemMigrationArgs } from './types'
+import { getJunctionTables } from '../model'
 
 const createEventStatementTrigger = (builder: MigrationBuilder, tableName: Name) => {
 	builder.createTrigger(tableName, 'log_event_statement', {
@@ -13,11 +14,11 @@ const createEventStatementTrigger = (builder: MigrationBuilder, tableName: Name)
 	})
 }
 
-export default async function (builder: MigrationBuilder, args: MigrationArgs) {
+export default async function (builder: MigrationBuilder, args: SystemMigrationArgs) {
 	const schema = await args.schemaResolver()
 	const junctionTables = getJunctionTables(schema.model)
-	const schemas = args.project.stages.map(formatSchemaName)
-	builder.sql(`CREATE OR REPLACE FUNCTION "system"."trigger_event"() RETURNS TRIGGER AS $$
+	const schemas = args.project.stages.map(it => `stage_${it.slug}`)
+	builder.sql(`CREATE OR REPLACE FUNCTION "trigger_event"() RETURNS TRIGGER AS $$
 DECLARE
     DECLARE new_event_type TEXT;
     DECLARE previous_id UUID;
@@ -79,26 +80,26 @@ BEGIN
         END CASE;
     CASE WHEN NULLIF(current_setting('system.current_stage_id' || TG_TABLE_SCHEMA, TRUE), '') IS NULL THEN
         PERFORM set_config('system.current_stage_id' || TG_TABLE_SCHEMA, "id"::TEXT, TRUE), set_config('system.current_stage_event' || TG_TABLE_SCHEMA, "event_id"::TEXT, TRUE)
-        FROM "system"."stage"
+        FROM "stage"
         WHERE "slug" = right(TG_TABLE_SCHEMA, -length('stage_'))
             FOR NO KEY UPDATE;
         ELSE
         -- do nothing
         END CASE;
     previous_id := current_setting('system.current_stage_event' || TG_TABLE_SCHEMA)::UUID;
-    INSERT INTO "system"."event" ("id", "type", "data", "previous_id")
+    INSERT INTO "event" ("id", "type", "data", "previous_id")
     VALUES (set_config('system.current_stage_event' || TG_TABLE_SCHEMA, system.uuid_generate_v4()::TEXT, TRUE)::UUID, new_event_type, new_event_data, previous_id);
 
     RETURN NULL;
 END;
 
 $$ LANGUAGE plpgsql`)
-	builder.sql(`CREATE OR REPLACE FUNCTION "system"."statement_trigger_event"() RETURNS TRIGGER AS
+	builder.sql(`CREATE OR REPLACE FUNCTION "statement_trigger_event"() RETURNS TRIGGER AS
 $$
 BEGIN
     CASE
         WHEN NULLIF(current_setting('system.current_stage_id' || TG_TABLE_SCHEMA, TRUE), '') IS NOT NULL THEN
-            UPDATE system.stage SET event_id = current_setting('system.current_stage_event' || TG_TABLE_SCHEMA)::UUID WHERE id = current_setting('system.current_stage_id' || TG_TABLE_SCHEMA)::UUID;
+            UPDATE stage SET event_id = current_setting('system.current_stage_event' || TG_TABLE_SCHEMA)::UUID WHERE id = current_setting('system.current_stage_id' || TG_TABLE_SCHEMA)::UUID;
         ELSE
         -- do nothing
         END CASE;

package/{migrations → src/migrations}/2021-03-23-110000-timestamp-fix.sql

@@ -1,6 +1,6 @@
-ALTER TABLE "system"."schema_migration"
+ALTER TABLE "schema_migration"
 	ALTER "executed_at" TYPE TIMESTAMPTZ,
 	ALTER "executed_at" SET DEFAULT now();
 
-ALTER TABLE "system"."event"
+ALTER TABLE "event"
 	ALTER "created_at" TYPE TIMESTAMPTZ;