@contember/schema-migrations 1.2.0-alpha.11 → 1.2.0-alpha.13

package/src/modifications/columns/UpdateColumnDefinitionModification.ts

@@ -5,6 +5,7 @@ import { createModificationType, Differ, ModificationHandler } from '../Modifica
 import deepEqual from 'fast-deep-equal'
 import { updateColumns } from '../utils/diffUtils'
 import { wrapIdentifier } from '@contember/database'
+import { getColumnSqlType } from '../utils/columnUtils'
 
 export class UpdateColumnDefinitionModificationHandler implements ModificationHandler<UpdateColumnDefinitionModificationData>  {
 	constructor(private readonly data: UpdateColumnDefinitionModificationData, private readonly schema: Schema) {}
@@ -14,34 +15,33 @@ export class UpdateColumnDefinitionModificationHandler implements ModificationHa
 		if (entity.view) {
 			return
 		}
-		const field = entity.fields[this.data.fieldName] as Model.AnyColumn
-		const definition = this.data.definition
-		const newType = definition.columnType !== field.columnType
-			? definition.type === Model.ColumnType.Enum
-				? `"${definition.columnType}"`
-				: definition.columnType
+		const oldColumn = entity.fields[this.data.fieldName] as Model.AnyColumn
+		const newColumn = this.data.definition
+		const newType = newColumn.columnType !== oldColumn.columnType
+			? getColumnSqlType(newColumn)
 			: undefined
-		builder.alterColumn(entity.tableName, field.columnName, {
+
+		builder.alterColumn(entity.tableName, oldColumn.columnName, {
 			type: newType,
-			notNull: field.nullable !== definition.nullable ? !definition.nullable : undefined,
-			using: newType !== undefined ? `${wrapIdentifier(field.columnName)}::${newType}` : undefined,
-			sequenceGenerated: field.sequence && !definition.sequence ? false : (!field.sequence ? definition.sequence : undefined),
+			notNull: oldColumn.nullable !== newColumn.nullable ? !newColumn.nullable : undefined,
+			using: newType !== undefined ? `${wrapIdentifier(oldColumn.columnName)}::${newType}` : undefined,
+			sequenceGenerated: oldColumn.sequence && !newColumn.sequence ? false : (!oldColumn.sequence ? newColumn.sequence : undefined),
 		})
 
 		const seqAlter = []
-		if (field.sequence && definition.sequence) {
-			if (field.sequence.precedence !== definition.sequence.precedence) {
-				seqAlter.push(`SET GENERATED ${definition.sequence.precedence}`)
+		if (oldColumn.sequence && newColumn.sequence) {
+			if (oldColumn.sequence.precedence !== newColumn.sequence.precedence) {
+				seqAlter.push(`SET GENERATED ${newColumn.sequence.precedence}`)
 			}
-			if (field.sequence.start !== definition.sequence.start && typeof definition.sequence.start == 'number') {
-				seqAlter.push(`SET START WITH ${definition.sequence.start}`)
+			if (oldColumn.sequence.start !== newColumn.sequence.start && typeof newColumn.sequence.start == 'number') {
+				seqAlter.push(`SET START WITH ${newColumn.sequence.start}`)
 			}
-			if (definition.sequence.restart) {
+			if (newColumn.sequence.restart) {
 				seqAlter.push('RESTART')
 			}
 		}
 		if (seqAlter.length > 0) {
-			builder.sql(`ALTER TABLE ${wrapIdentifier(entity.tableName)} ALTER ${wrapIdentifier(field.columnName)} ${seqAlter.join(' ')}`)
+			builder.sql(`ALTER TABLE ${wrapIdentifier(entity.tableName)} ALTER ${wrapIdentifier(oldColumn.columnName)} ${seqAlter.join(' ')}`)
 		}
 	}
 

package/src/modifications/entities/CreateEntityModification.ts

@@ -9,6 +9,7 @@ import {
 } from '../ModificationHandler'
 import { createEventTrigger, createEventTrxTrigger } from '../utils/sqlUpdateUtils'
 import { PartialEntity } from '../../utils/PartialEntity.js'
+import { getColumnSqlType } from '../utils/columnUtils'
 
 export class CreateEntityModificationHandler implements ModificationHandler<CreateEntityModificationData> {
 	constructor(
@@ -29,7 +30,7 @@ export class CreateEntityModificationHandler implements ModificationHandler<Crea
 		builder.createTable(entity.tableName, {
 			[primaryColumn.name]: {
 				primaryKey: true,
-				type: primaryColumn.type === Model.ColumnType.Enum ? `"${primaryColumn.columnType}"` : primaryColumn.columnType,
+				type: getColumnSqlType(primaryColumn),
 				notNull: true,
 				sequenceGenerated: primaryColumn.sequence,
 			},

package/src/modifications/utils/columnUtils.ts

@@ -0,0 +1,5 @@
+import { Model } from '@contember/schema'
+
+export const getColumnSqlType = (column: Model.AnyColumn) => column.type === Model.ColumnType.Enum
+	? `"${column.columnType}"`
+	: column.columnType

package/tests/cases/integration/createColumn.test.ts

@@ -35,3 +35,36 @@ UPDATE "author" SET "name" = $pga$unnamed author$pga$;
 SET CONSTRAINTS ALL IMMEDIATE; SET CONSTRAINTS ALL DEFERRED;
 ALTER TABLE "author" ALTER "name" SET NOT NULL;`,
 })
+
+testMigrations('create a column with copy value', {
+	originalSchema: def.createModel({
+		Author: class Author {
+			email = def.stringColumn().unique()
+		},
+	}),
+	updatedSchema: def.createModel({
+		Author: class Author {
+			name = def.stringColumn().notNull()
+			email = def.stringColumn().unique()
+		},
+	}),
+	diff: [
+		{
+			modification: 'createColumn',
+			entityName: 'Author',
+			field: {
+				columnName: 'name',
+				name: 'name',
+				nullable: false,
+				type: Model.ColumnType.String,
+				columnType: 'text',
+			},
+			copyValue: 'email',
+		},
+	],
+	noDiff: true,
+	sql: SQL`ALTER TABLE "author" ADD "name" text;
+UPDATE "author" SET "name" = "email"::text;
+SET CONSTRAINTS ALL IMMEDIATE; SET CONSTRAINTS ALL DEFERRED;
+ALTER TABLE "author" ALTER "name" SET NOT NULL;`,
+})