@contember/schema-migrations 1.2.1 → 1.3.0-alpha.13

package/src/modifications/fields/UpdateFieldNameModification.ts

@@ -13,21 +13,28 @@ import {
 	updateModel,
 	updateSchema,
 } from '../utils/schemaUpdateUtils'
-import { createModificationType, ModificationHandler, ModificationHandlerOptions } from '../ModificationHandler'
-import { acceptFieldVisitor, NamingHelper, PredicateDefinitionProcessor } from '@contember/schema-utils'
-import { VERSION_ACL_PATCH, VERSION_UPDATE_CONSTRAINT_NAME } from '../ModificationVersions'
-import { renameConstraintSchemaUpdater, renameConstraintsSqlBuilder } from '../utils/renameConstraintsHelper'
+import {
+	createModificationType,
+	ModificationHandler,
+	ModificationHandlerCreateSqlOptions,
+	ModificationHandlerOptions,
+} from '../ModificationHandler'
+import { acceptFieldVisitor, PredicateDefinitionProcessor } from '@contember/schema-utils'
+import {
+	VERSION_ACL_PATCH,
+	VERSION_UPDATE_CONSTRAINT_FIELDS,
+	VERSION_UPDATE_INDEX_FIELDS,
+} from '../ModificationVersions'
 import { changeValue } from '../utils/valueUtils'
 import { updateColumnNameModification } from '../columns'
 import { NoopModification } from '../NoopModification'
-import { SchemaWithMeta } from '../utils/schemaMeta'
 
 export class UpdateFieldNameModificationHandler implements ModificationHandler<UpdateFieldNameModificationData> {
 	private renameColumnSubModification: ModificationHandler<any> = new NoopModification()
 
 	constructor(
 		private readonly data: UpdateFieldNameModificationData,
-		private readonly schema: SchemaWithMeta,
+		private readonly schema: Schema,
 		private readonly options: ModificationHandlerOptions,
 	) {
 		if (this.data.columnName) {
@@ -39,40 +46,39 @@ export class UpdateFieldNameModificationHandler implements ModificationHandler<U
 		}
 	}
 
-	public createSql(builder: MigrationBuilder): void {
+	public createSql(builder: MigrationBuilder, options: ModificationHandlerCreateSqlOptions): void {
 		const entity = this.schema.model.entities[this.data.entityName]
 		if (entity.view) {
 			return
 		}
-		if (this.options.formatVersion >= VERSION_UPDATE_CONSTRAINT_NAME) {
-			renameConstraintsSqlBuilder(builder, entity, this.getNewConstraintName.bind(this))
-		}
-		this.renameColumnSubModification.createSql(builder)
+		this.renameColumnSubModification.createSql(builder, options)
 	}
 
 	public getSchemaUpdater(): SchemaUpdater {
-		const updateConstraintName =
-			this.options.formatVersion >= VERSION_UPDATE_CONSTRAINT_NAME
-				? updateEntity(this.data.entityName, renameConstraintSchemaUpdater(this.getNewConstraintName.bind(this)))
-				: undefined
 		const updateConstraintFields =
-			this.options.formatVersion >= VERSION_UPDATE_CONSTRAINT_NAME
+			this.options.formatVersion >= VERSION_UPDATE_CONSTRAINT_FIELDS
 				? updateEntity(this.data.entityName, ({ entity }) => {
 					return {
 						...entity,
-						unique: Object.fromEntries(
-							Object.entries(entity.unique).map(([name, unique]) => [
-								name,
-								{
-									...unique,
-									fields: unique.fields.map(changeValue(this.data.fieldName, this.data.newFieldName)),
-								},
-							]),
-						),
+						unique: entity.unique.map(unique => ({
+							...unique,
+							fields: unique.fields.map(changeValue(this.data.fieldName, this.data.newFieldName)),
+						})),
 					}
 				  })
 				: undefined
-
+		const updateIndexFields =
+			this.options.formatVersion >= VERSION_UPDATE_INDEX_FIELDS
+				? updateEntity(this.data.entityName, ({ entity }) => {
+					return {
+						...entity,
+						indexes: entity.indexes.map(unique => ({
+							...unique,
+							fields: unique.fields.map(changeValue(this.data.fieldName, this.data.newFieldName)),
+						})),
+					}
+				})
+				: undefined
 		const updateRelationReferences = updateEveryEntity(
 			updateEveryField(({ field, entity }) => {
 				const isUpdatedRelation = (entity: Model.Entity, relation: Model.AnyRelation | null) => {
@@ -168,26 +174,14 @@ export class UpdateFieldNameModificationHandler implements ModificationHandler<U
 			updateAclOp,
 			this.renameColumnSubModification.getSchemaUpdater(),
 			updateModel(
-				updateConstraintName,
 				updateConstraintFields,
+				updateIndexFields,
 				updateRelationReferences,
 				updateFieldName,
 			),
 		)
 	}
 
-
-	private getNewConstraintName(constraint: Model.UniqueConstraint): string | null {
-		const generatedName = NamingHelper.createUniqueConstraintName(this.data.entityName, constraint.fields)
-		const isGenerated = constraint.name === generatedName
-		if (!isGenerated) {
-			null
-		}
-		const newFieldNames = constraint.fields.map(changeValue(this.data.fieldName, this.data.newFieldName))
-		const newName = NamingHelper.createUniqueConstraintName(this.data.entityName, newFieldNames)
-		return newName === constraint.name ? null : newName
-	}
-
 	describe() {
 		return { message: `Change field name ${this.data.entityName}.${this.data.fieldName} to ${this.data.newFieldName}` }
 	}

package/src/modifications/indexes/CreateIndexModification.ts

@@ -1,56 +1,47 @@
 import { MigrationBuilder } from '@contember/database-migrations'
 import { Model, Schema } from '@contember/schema'
 import { SchemaUpdater, updateEntity, updateModel } from '../utils/schemaUpdateUtils'
-import { createModificationType, Differ, ModificationHandler } from '../ModificationHandler'
-import { acceptFieldVisitor } from '@contember/schema-utils'
+import {
+	createModificationType,
+	Differ,
+	ModificationHandler,
+	ModificationHandlerCreateSqlOptions,
+} from '../ModificationHandler'
+import { wrapIdentifier } from '../../utils/dbHelpers'
+import { getIndexColumns } from './utils'
+import deepEqual from 'fast-deep-equal'
 
 export class CreateIndexModificationHandler implements ModificationHandler<CreateIndexModificationData> {
 	constructor(private readonly data: CreateIndexModificationData, private readonly schema: Schema) {}
 
-	public createSql(builder: MigrationBuilder): void {
+	public createSql(builder: MigrationBuilder, { databaseMetadata, invalidateDatabaseMetadata }: ModificationHandlerCreateSqlOptions): void {
 		const entity = this.schema.model.entities[this.data.entityName]
 		if (entity.view) {
 			return
 		}
 		const fields = this.data.index.fields
-		const columns = fields.map(fieldName => {
-			return acceptFieldVisitor(this.schema.model, entity, fieldName, {
-				visitColumn: ({ column }) => {
-					return column.columnName
-				},
-				visitManyHasOne: ({ relation }) => {
-					return relation.joiningColumn.columnName
-				},
-				visitOneHasOneOwning: ({ relation }) => {
-					return relation.joiningColumn.columnName
-				},
-				visitOneHasMany: () => {
-					throw new Error(`Cannot create index on 1:m relation in ${entity.name}.${fieldName}`)
-				},
-				visitOneHasOneInverse: () => {
-					throw new Error(`Cannot create index on 1:1 inverse relation in ${entity.name}.${fieldName}`)
-				},
-				visitManyHasManyOwning: () => {
-					throw new Error(`Cannot create index on m:m relation in ${entity.name}.${fieldName}`)
-				},
-				visitManyHasManyInverse: () => {
-					throw new Error(`Cannot create index on m:m inverse relation in ${entity.name}.${fieldName}`)
-				},
-			})
-		})
-		builder.addIndex(entity.tableName, [...columns], {
-			name: this.data.index.name,
+		const columns = getIndexColumns({
+			fields,
+			entity,
+			model: this.schema.model,
 		})
+
+		const tableNameId = wrapIdentifier(entity.tableName)
+		const columnNameIds = columns.map(wrapIdentifier)
+
+		builder.sql(`CREATE INDEX ON ${tableNameId} (${columnNameIds.join(', ')})`)
+
+		invalidateDatabaseMetadata()
 	}
 
 	public getSchemaUpdater(): SchemaUpdater {
 		return updateModel(
 			updateEntity(this.data.entityName, ({ entity }) => ({
 				...entity,
-				indexes: {
+				indexes: [
 					...entity.indexes,
-					[this.data.index.name]: this.data.index,
-				},
+					this.data.index,
+				],
 			})),
 		)
 	}
@@ -67,17 +58,20 @@ export const createIndexModification = createModificationType({
 	handler: CreateIndexModificationHandler,
 })
 
+export interface CreateIndexModificationData {
+	entityName: string
+	index: Model.Index
+}
+
 export class CreateIndexDiffer implements Differ {
 	createDiff(originalSchema: Schema, updatedSchema: Schema) {
 		return Object.values(updatedSchema.model.entities).flatMap(entity =>
-			Object.values(entity.indexes)
-				.filter(it => !originalSchema.model.entities[entity.name].indexes[it.name])
-				.map(index => createIndexModification.createModification({ entityName: entity.name, index })),
+			entity.indexes
+				.filter(it => !originalSchema.model.entities[entity.name].indexes.find(idx => deepEqual(idx.fields, it.fields)))
+				.map(index => createIndexModification.createModification({
+					entityName: entity.name,
+					index,
+				})),
 		)
 	}
 }
-
-export interface CreateIndexModificationData {
-	entityName: string
-	index: Model.Index
-}

package/src/modifications/indexes/RemoveIndexModification.ts

@@ -1,26 +1,45 @@
 import { MigrationBuilder } from '@contember/database-migrations'
 import { Schema } from '@contember/schema'
 import { SchemaUpdater, updateEntity, updateModel } from '../utils/schemaUpdateUtils'
-import { createModificationType, Differ, ModificationHandler } from '../ModificationHandler'
+import {
+	createModificationType,
+	Differ,
+	ModificationHandler,
+	ModificationHandlerCreateSqlOptions,
+} from '../ModificationHandler'
 import deepEqual from 'fast-deep-equal'
+import { getIndexColumns } from './utils'
+import { wrapIdentifier } from '../../utils/dbHelpers'
 
 export class RemoveIndexModificationHandler implements ModificationHandler<RemoveIndexModificationData>  {
 	constructor(private readonly data: RemoveIndexModificationData, private readonly schema: Schema) {}
 
-	public createSql(builder: MigrationBuilder): void {
+	public createSql(builder: MigrationBuilder, { databaseMetadata, invalidateDatabaseMetadata }: ModificationHandlerCreateSqlOptions): void {
 		const entity = this.schema.model.entities[this.data.entityName]
 		if (entity.view) {
 			return
 		}
-		builder.dropIndex(entity.tableName, [], {
-			name: this.data.indexName,
+		const fields = this.getFields()
+
+		const columns = getIndexColumns({
+			entity,
+			fields,
+			model: this.schema.model,
 		})
+
+		const indexNames = databaseMetadata.getIndexNames({ tableName: entity.tableName, columnNames: columns })
+
+		for (const name of indexNames) {
+			builder.sql(`DROP INDEX ${wrapIdentifier(name)}`)
+		}
+		invalidateDatabaseMetadata()
 	}
 
 	public getSchemaUpdater(): SchemaUpdater {
+		const fields = this.getFields()
 		return updateModel(
 			updateEntity(this.data.entityName, ({ entity }) => {
-				const { [this.data.indexName]: removed, ...indexes } = entity.indexes
+				const indexes = entity.indexes.filter(it => !deepEqual(it.fields, fields))
 				return {
 					...entity,
 					indexes,
@@ -30,9 +49,20 @@ export class RemoveIndexModificationHandler implements ModificationHandler<Remov
 	}
 
 	describe() {
-		const fields = this.schema.model.entities[this.data.entityName].indexes[this.data.indexName].fields
+		const fields = this.getFields()
 		return { message: `Remove index (${fields.join(', ')}) on entity ${this.data.entityName}` }
 	}
+
+	getFields() {
+		const entity = this.schema.model.entities[this.data.entityName]
+		const fields = 'indexName' in this.data
+			? entity.indexes.find(it => it.name === this.data.indexName)?.fields
+			: this.data.fields
+		if (!fields) {
+			throw new Error()
+		}
+		return fields
+	}
 }
 
 export const removeIndexModification = createModificationType({
@@ -41,28 +71,38 @@ export const removeIndexModification = createModificationType({
 })
 
 
+export type RemoveIndexModificationData =
+	| {
+		entityName: string
+		indexName: string
+		fields?: never
+	}
+	| {
+		entityName: string
+		fields: readonly string[]
+		indexName?: never
+	}
+
 export class RemoveIndexDiffer implements Differ {
 
 	createDiff(originalSchema: Schema, updatedSchema: Schema) {
 		return Object.values(originalSchema.model.entities).flatMap(entity =>
-			Object.values(entity.indexes)
+			entity.indexes
 				.filter(
-					it =>
-						updatedSchema.model.entities[entity.name] &&
-						(!updatedSchema.model.entities[entity.name].indexes[it.name] ||
-							!deepEqual(it.fields, updatedSchema.model.entities[entity.name].indexes[it.name].fields)),
+					it => {
+						const updatedEntity = updatedSchema.model.entities[entity.name]
+						if (!updatedEntity) {
+							return false
+						}
+						return !updatedEntity.indexes.find(index => deepEqual(index.fields, it.fields))
+					},
 				)
 				.map(index =>
 					removeIndexModification.createModification({
 						entityName: entity.name,
-						indexName: index.name,
+						fields: index.fields,
 					}),
 				),
 		)
 	}
 }
-
-export interface RemoveIndexModificationData {
-	entityName: string
-	indexName: string
-}

package/src/modifications/indexes/utils.ts

@@ -0,0 +1,30 @@
+import { acceptFieldVisitor } from '@contember/schema-utils'
+import { Model } from '@contember/schema'
+
+export const getIndexColumns = ({ entity, fields, model }: { fields: readonly string[]; model: Model.Schema; entity: Model.Entity }) => {
+	return fields.map(fieldName => {
+		return acceptFieldVisitor(model, entity, fieldName, {
+			visitColumn: ({ column }) => {
+				return column.columnName
+			},
+			visitManyHasOne: ({ relation }) => {
+				return relation.joiningColumn.columnName
+			},
+			visitOneHasOneOwning: ({ relation }) => {
+				return relation.joiningColumn.columnName
+			},
+			visitOneHasMany: () => {
+				throw new Error(`Cannot create index on 1:m relation in ${entity.name}.${fieldName}`)
+			},
+			visitOneHasOneInverse: () => {
+				throw new Error(`Cannot create index on 1:1 inverse relation in ${entity.name}.${fieldName}`)
+			},
+			visitManyHasManyOwning: () => {
+				throw new Error(`Cannot create index on m:m relation in ${entity.name}.${fieldName}`)
+			},
+			visitManyHasManyInverse: () => {
+				throw new Error(`Cannot create index on m:m inverse relation in ${entity.name}.${fieldName}`)
+			},
+		})
+	})
+}

package/src/modifications/relations/ConvertOneHasManyToManyHasManyRelationModification.ts

@@ -1,33 +1,25 @@
 import { MigrationBuilder } from '@contember/database-migrations'
 import { Model, Schema } from '@contember/schema'
-import {
-	addField,
-	addTakenIndexName,
-	SchemaUpdater,
-	updateEntity,
-	updateModel,
-	updateSchema,
-} from '../utils/schemaUpdateUtils'
+import { addField, SchemaUpdater, updateEntity, updateModel, updateSchema } from '../utils/schemaUpdateUtils'
 import {
 	createModificationType,
 	Differ,
-	ModificationHandler,
+	ModificationHandler, ModificationHandlerCreateSqlOptions,
 	ModificationHandlerOptions,
 } from '../ModificationHandler'
-import { isInverseRelation, isOwningRelation, NamingHelper } from '@contember/schema-utils'
+import { isInverseRelation, isOwningRelation } from '@contember/schema-utils'
 import { updateRelations } from '../utils/diffUtils'
 import { createJunctionTableSql } from '../utils/createJunctionTable'
-import { wrapIdentifier } from '@contember/database'
+import { wrapIdentifier } from '../../utils/dbHelpers'
 import { normalizeManyHasManyRelation, PartialManyHasManyRelation } from './normalization'
 import { updateFieldNameModification } from '../fields'
-import { SchemaWithMeta } from '../utils/schemaMeta'
 
 export class ConvertOneHasManyToManyHasManyRelationModificationHandler implements ModificationHandler<ConvertOneHasManyToManyHasManyRelationModificationData> {
 	private subModification: ModificationHandler<any>
 
 	constructor(
 		private readonly data: ConvertOneHasManyToManyHasManyRelationModificationData,
-		private readonly schema: SchemaWithMeta,
+		private readonly schema: Schema,
 		private readonly options: ModificationHandlerOptions,
 	) {
 		this.subModification = updateFieldNameModification.createHandler(
@@ -41,12 +33,12 @@ export class ConvertOneHasManyToManyHasManyRelationModificationHandler implement
 		)
 	}
 
-	public createSql(builder: MigrationBuilder): void {
+	public createSql(builder: MigrationBuilder, { systemSchema }: ModificationHandlerCreateSqlOptions): void {
 		const targetEntity = this.schema.model.entities[this.data.owningSide.target]
 		const { relation: oldRelation } = this.getRelation()
 		const entity = this.schema.model.entities[this.data.entityName]
 
-		createJunctionTableSql(builder, this.options.systemSchema, this.schema, entity, targetEntity, normalizeManyHasManyRelation(this.data.owningSide))
+		createJunctionTableSql(builder, systemSchema, this.schema, entity, targetEntity, normalizeManyHasManyRelation(this.data.owningSide))
 		const joiningTable = this.data.owningSide.joiningTable
 		builder.sql(`
 			INSERT INTO ${wrapIdentifier(joiningTable.tableName)} (
@@ -66,7 +58,6 @@ export class ConvertOneHasManyToManyHasManyRelationModificationHandler implement
 			this.subModification.getSchemaUpdater(),
 			updateModel(updateEntity(entityName, addField(normalizeManyHasManyRelation(this.data.owningSide)))),
 			this.data.inverseSide ? updateModel(updateEntity(this.data.owningSide.target, addField(this.data.inverseSide))) : undefined,
-			addTakenIndexName(NamingHelper.createJunctionTablePrimaryConstraintName(this.data.owningSide.joiningTable.tableName)),
 		)
 	}
 
@@ -76,9 +67,6 @@ export class ConvertOneHasManyToManyHasManyRelationModificationHandler implement
 		}
 	}
 
-
-
-
 	private getRelation(): { entity: Model.Entity; relation: Model.ManyHasOneRelation } {
 		const entity = this.schema.model.entities[this.data.entityName]
 		const relation = entity.fields[this.data.fieldName]

package/src/modifications/relations/ConvertOneToManyRelationModification.ts

@@ -1,31 +1,25 @@
 import { MigrationBuilder } from '@contember/database-migrations'
 import { Model, Schema } from '@contember/schema'
-import {
-	addTakenIndexName,
-	SchemaUpdater,
-	updateEntity,
-	updateField,
-	updateModel,
-	updateSchema,
-} from '../utils/schemaUpdateUtils'
+import { SchemaUpdater, updateEntity, updateField, updateModel, updateSchema } from '../utils/schemaUpdateUtils'
 import {
 	createModificationType,
 	Differ,
 	ModificationHandler,
+	ModificationHandlerCreateSqlOptions,
 	ModificationHandlerOptions,
 } from '../ModificationHandler'
-import { isOwningRelation, NamingHelper } from '@contember/schema-utils'
+import { isOwningRelation } from '@contember/schema-utils'
 import { updateRelations } from '../utils/diffUtils'
 import { NoopModification } from '../NoopModification'
 import { updateFieldNameModification } from '../fields'
-import { resolveIndexName, SchemaWithMeta } from '../utils/schemaMeta'
+import { wrapIdentifier } from '../../utils/dbHelpers'
 
 export class ConvertOneToManyRelationModificationHandler implements ModificationHandler<ConvertOneToManyRelationModificationData> {
 	private subModification: ModificationHandler<any>
 
 	constructor(
 		private readonly data: ConvertOneToManyRelationModificationData,
-		private readonly schema: SchemaWithMeta,
+		private readonly schema: Schema,
 		private readonly options: ModificationHandlerOptions,
 	) {
 		const { relation } = this.getRelation()
@@ -42,24 +36,30 @@ export class ConvertOneToManyRelationModificationHandler implements Modification
 			: new NoopModification()
 	}
 
-	public createSql(builder: MigrationBuilder): void {
+	public createSql(builder: MigrationBuilder, options: ModificationHandlerCreateSqlOptions): void {
 		const { entity, relation } = this.getRelation()
 		const columnName = relation.joiningColumn.columnName
-		const proposedIndexName = NamingHelper.createForeignKeyIndexName(entity.tableName, columnName)
-		const indexName = resolveIndexName(this.schema, proposedIndexName)
-		builder.addIndex(entity.tableName, columnName, {
-			name: indexName,
+
+		const tableNameId = wrapIdentifier(entity.tableName)
+		const columnNameId = wrapIdentifier(columnName)
+		builder.sql(`CREATE INDEX ON ${tableNameId} (${columnNameId})`)
+
+		const uniqueConstraintNames = options.databaseMetadata.getUniqueConstraintNames({
+			tableName: entity.tableName,
+			columnNames: [relation.joiningColumn.columnName],
 		})
-		const uniqueConstraintName = NamingHelper.createUniqueConstraintName(entity.name, [relation.name])
-		builder.dropConstraint(entity.tableName, uniqueConstraintName)
-		this.subModification.createSql(builder)
+		for (const name of uniqueConstraintNames) {
+			builder.sql(`ALTER TABLE ${wrapIdentifier(entity.tableName)} DROP CONSTRAINT ${wrapIdentifier(name)}`)
+		}
+		options.invalidateDatabaseMetadata()
+
+		this.subModification.createSql(builder, options)
 	}
 
 	public getSchemaUpdater(): SchemaUpdater {
 		const { relation } = this.getRelation()
 		const { entityName, fieldName } = this.data
-		const entity = this.schema.model.entities[this.data.entityName]
-		const field = entity.fields[fieldName] as Model.OneHasOneOwningRelation
+
 		return updateSchema(
 			updateModel(
 				updateEntity(
@@ -87,7 +87,6 @@ export class ConvertOneToManyRelationModificationHandler implements Modification
 						),
 					),
 				) : undefined,
-			addTakenIndexName(NamingHelper.createForeignKeyIndexName(entity.tableName, field.joiningColumn.columnName)),
 		)
 	}
 

package/src/modifications/relations/CreateRelationModification.ts

@@ -1,24 +1,11 @@
 import { Model, Schema } from '@contember/schema'
-import {
-	acceptRelationTypeVisitor,
-	isInverseRelation,
-	isOwningRelation,
-	isRelation,
-	NamingHelper,
-} from '@contember/schema-utils'
+import { acceptRelationTypeVisitor, isInverseRelation, isOwningRelation, isRelation } from '@contember/schema-utils'
 import { MigrationBuilder } from '@contember/database-migrations'
-import {
-	addField,
-	addTakenIndexName,
-	SchemaUpdater,
-	updateEntity,
-	updateModel,
-	updateSchema,
-} from '../utils/schemaUpdateUtils'
+import { addField, SchemaUpdater, updateEntity, updateModel, updateSchema } from '../utils/schemaUpdateUtils'
 import {
 	createModificationType,
 	Differ,
-	ModificationHandler,
+	ModificationHandler, ModificationHandlerCreateSqlOptions,
 	ModificationHandlerOptions,
 } from '../ModificationHandler'
 import { isIt } from '../../utils/isIt'
@@ -26,18 +13,23 @@ import { createFields } from '../utils/diffUtils'
 import { getPrimaryColumnType } from '../utils/getPrimaryColumnType'
 import { createJunctionTableSql } from '../utils/createJunctionTable'
 import { normalizeManyHasManyRelation, PartialManyHasManyRelation } from './normalization'
-import { resolveIndexName, SchemaWithMeta } from '../utils/schemaMeta'
+import { addForeignKeyConstraint } from './helpers'
+import { wrapIdentifier } from '../../utils/dbHelpers'
 
 
 export class CreateRelationModificationHandler implements ModificationHandler<CreateRelationModificationData> {
 
 	constructor(
 		private readonly data: CreateRelationModificationData,
-		private readonly schema: SchemaWithMeta,
+		private readonly schema: Schema,
 		private readonly options: ModificationHandlerOptions,
 	) {}
 
-	public createSql(builder: MigrationBuilder): void {
+	public createSql(builder: MigrationBuilder, {
+		databaseMetadata,
+		systemSchema,
+		invalidateDatabaseMetadata,
+	}: ModificationHandlerCreateSqlOptions): void {
 		const entity = this.schema.model.entities[this.data.entityName]
 		if (entity.view) {
 			return
@@ -50,48 +42,34 @@ export class CreateRelationModificationHandler implements ModificationHandler<Cr
 					notNull: !relation.nullable,
 				},
 			})
-			const fkName = NamingHelper.createForeignKeyName(
-				entity.tableName,
-				relation.joiningColumn.columnName,
-				targetEntity.tableName,
-				targetEntity.primaryColumn,
-			)
-			builder.addConstraint(entity.tableName, fkName, {
-				foreignKeys: {
-					columns: relation.joiningColumn.columnName,
-					references: `"${targetEntity.tableName}"("${targetEntity.primaryColumn}")`,
-					onDelete: 'NO ACTION',
-				},
-				deferrable: true,
-				deferred: false,
-			})
+			addForeignKeyConstraint({ builder, entity, targetEntity, relation, databaseMetadata, invalidateDatabaseMetadata })
 		}
 		acceptRelationTypeVisitor(this.schema.model, entity, this.getNormalizedOwningSide(), {
 			visitManyHasOne: ({ relation }) => {
 				createOwningSide(relation)
 				const columnName = relation.joiningColumn.columnName
-				const proposedIndexName = NamingHelper.createForeignKeyIndexName(entity.tableName, columnName)
-				const indexName = resolveIndexName(this.schema, proposedIndexName)
-				builder.addIndex(entity.tableName, columnName, {
-					name: indexName,
-				})
+				const tableNameId = wrapIdentifier(entity.tableName)
+				const columnNameId = wrapIdentifier(columnName)
+				builder.sql(`CREATE INDEX ON ${tableNameId} (${columnNameId})`)
+				invalidateDatabaseMetadata()
 			},
 			visitOneHasMany: () => {},
 			visitOneHasOneOwning: ({ relation }) => {
 				createOwningSide(relation)
-				const uniqueConstraintName = NamingHelper.createUniqueConstraintName(entity.name, [relation.name])
-				builder.addConstraint(entity.tableName, uniqueConstraintName, { unique: [relation.joiningColumn.columnName] })
+				const tableNameId = wrapIdentifier(entity.tableName)
+				const columnNameId = wrapIdentifier(relation.joiningColumn.columnName)
+				builder.sql(`ALTER TABLE ${tableNameId} ADD UNIQUE (${columnNameId})`)
+				invalidateDatabaseMetadata()
 			},
 			visitOneHasOneInverse: () => {},
 			visitManyHasManyOwning: ({ relation }) => {
-				createJunctionTableSql(builder, this.options.systemSchema, this.schema, entity, targetEntity, relation)
+				createJunctionTableSql(builder, systemSchema, this.schema, entity, targetEntity, relation)
 			},
 			visitManyHasManyInverse: () => {},
 		})
 	}
 
 	public getSchemaUpdater(): SchemaUpdater {
-		const entity = this.schema.model.entities[this.data.entityName]
 		return updateSchema(
 			updateModel(
 				updateEntity(this.data.entityName, addField(this.getNormalizedOwningSide())),
@@ -99,12 +77,6 @@ export class CreateRelationModificationHandler implements ModificationHandler<Cr
 					? updateEntity(this.data.owningSide.target, addField(this.data.inverseSide))
 					: undefined,
 			),
-			this.data.owningSide.type === Model.RelationType.ManyHasOne
-				? addTakenIndexName(NamingHelper.createForeignKeyIndexName(entity.tableName, this.data.owningSide.joiningColumn.columnName))
-				: undefined,
-			this.data.owningSide.type === Model.RelationType.ManyHasMany && isOwningRelation(this.data.owningSide)
-				? addTakenIndexName(NamingHelper.createJunctionTablePrimaryConstraintName(this.data.owningSide.joiningTable.tableName))
-				: undefined,
 		)
 	}