@contember/schema-migrations 2.1.0-alpha.2 → 2.1.0-alpha.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/schema-migrations",
-  "version": "2.1.0-alpha.2",
+  "version": "2.1.0-alpha.20",
   "license": "Apache-2.0",
   "main": "./dist/production/index.js",
   "typings": "./dist/types/index.d.ts",
@@ -23,16 +23,16 @@
     }
   },
   "dependencies": {
-    "@contember/database": "2.1.0-alpha.2",
-    "@contember/database-migrations": "2.1.0-alpha.2",
-    "@contember/engine-common": "2.1.0-alpha.2",
-    "@contember/schema": "2.1.0-alpha.2",
-    "@contember/schema-utils": "2.1.0-alpha.2",
+    "@contember/database": "2.1.0-alpha.20",
+    "@contember/database-migrations": "2.1.0-alpha.20",
+    "@contember/engine-common": "2.1.0-alpha.20",
+    "@contember/schema": "2.1.0-alpha.20",
+    "@contember/schema-utils": "2.1.0-alpha.20",
     "fast-deep-equal": "^3.1.3",
     "rfc6902": "^5.1.1"
   },
   "devDependencies": {
-    "@contember/schema-definition": "2.1.0-alpha.2"
+    "@contember/schema-definition": "2.1.0-alpha.20"
   },
   "peerDependencies": {
     "pg": "^8.9.0"

package/src/modifications/columns/UpdateColumnDefinitionModification.ts

@@ -28,7 +28,9 @@ export class UpdateColumnDefinitionModificationHandler implements ModificationHa
 
 		const columnNameWrapped = wrapIdentifier(oldColumn.columnName)
 		const isChangedToArray = !oldColumn.list && newColumn.list
-		const usingCast = (isChangedToArray ? `ARRAY[${columnNameWrapped}]` : columnNameWrapped) + `::${columnType}`
+		const usingCast = isChangedToArray
+			? `CASE WHEN ${columnNameWrapped} IS NULL THEN ${newColumn.nullable ? 'NULL' : `ARRAY[]::${columnType}`} ELSE ARRAY[${columnNameWrapped}]::${columnType} END`
+			: `${columnNameWrapped}::${columnType}`
 
 		const seedExpression = formatSeedExpression({
 			model: this.schema.model,

package/src/modifications/constraints/CreateUniqueConstraintModification.ts

@@ -34,7 +34,7 @@ export class CreateUniqueConstraintModificationHandler implements ModificationHa
 		const columnNameIds = columns.map(wrapIdentifier)
 
 		if ('index' in this.data.unique && this.data.unique.index) {
-			const nulls = this.data.unique.nulls === 'not distinct' ? ' NULLS NOT DISTINCT' : ' NULLS DISTINCT'
+			const nulls = this.data.unique.nulls === 'not distinct' ? ' NULLS NOT DISTINCT' : ''
 			builder.sql(`CREATE UNIQUE INDEX ON ${tableNameId} (${columnNameIds.join(', ')})${nulls}`)
 		} else {
 			let checkModifier = ''

package/src/modifications/entities/RemoveEntityModification.ts

@@ -31,7 +31,11 @@ export class RemoveEntityModificationHandler implements ModificationHandler<Remo
 	public createSql(builder: MigrationBuilder, options: ModificationHandlerCreateSqlOptions): void {
 		const entity = this.schema.model.entities[this.data.entityName]
 		if (entity.view) {
-			builder.dropView(entity.tableName)
+			if (entity.view.materialized) {
+				builder.dropMaterializedView(entity.tableName)
+			} else {
+				builder.dropView(entity.tableName)
+			}
 			return
 		}
 		if (this.options.formatVersion >= VERSION_REMOVE_REFERENCING_RELATIONS) {

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

@@ -233,5 +233,5 @@ describe('create unique index', () => testMigrations({
 			},
 		}),
 	],
-	sql: SQL`CREATE UNIQUE INDEX ON "author" ("email") NULLS DISTINCT;`,
+	sql: SQL`CREATE UNIQUE INDEX ON "author" ("email");`,
 }))

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

@@ -251,5 +251,32 @@ describe('change string to array string', () => testMigrations({
 			},
 		}),
 	],
-	sql: SQL`ALTER TABLE "author" ALTER "email" SET DATA TYPE text[] USING ARRAY["email"]::text[];`,
+	sql: SQL`ALTER TABLE "author" ALTER "email" SET DATA TYPE text[] USING CASE WHEN "email" IS NULL THEN NULL ELSE ARRAY["email"]::text[] END;`,
+}))
+
+describe('change string to array string not null', () => testMigrations({
+	original: createSchema({
+		Author: class Author {
+			email = def.stringColumn().notNull()
+		},
+	}),
+	updated: createSchema({
+		Author: class Author {
+			email = def.stringColumn().list().notNull()
+		},
+	}),
+	diff: [
+		updateColumnDefinitionModification.createModification({
+			entityName: 'Author',
+			fieldName: 'email',
+			definition: {
+				type: Model.ColumnType.String,
+				columnType: 'text',
+				nullable: false,
+				list: true,
+			},
+		}),
+	],
+	sql: SQL`ALTER TABLE "author"
+        ALTER "email" SET DATA TYPE text[] USING CASE WHEN "email" IS NULL THEN ARRAY[]::text[] ELSE ARRAY["email"]::text[] END;`,
 }))