@contember/schema-migrations 2.2.0-alpha.11 → 2.2.0-alpha.12

package/package.json

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

package/src/modifications/utils/schemaUpdateUtils.ts

@@ -92,29 +92,35 @@ type EntityAclFieldPermissionsUpdater = (
 	entityName: string,
 	operation: Acl.Operation,
 ) => Acl.FieldPermissions
-type EntityOperationHandler = {
-	[K in keyof Required<Acl.EntityOperations>]: (
-		value: Exclude<Acl.EntityOperations[K], undefined>,
-	) => Acl.EntityOperations[K]
-}
-
 export const updateAclFieldPermissions =
 	(updater: EntityAclFieldPermissionsUpdater): AclEntityPermissionsUpdater => ({ entityPermissions, entityName }) => {
-		const operations: Writable<Acl.EntityOperations> = {}
-		const handlers: EntityOperationHandler = {
-			create: value => updater(value, entityName, Acl.Operation.create),
-			update: value => updater(value, entityName, Acl.Operation.update),
-			read: value => updater(value, entityName, Acl.Operation.read),
-			delete: value => value,
-			customPrimary: value => value,
-			refreshMaterializedView: value => value,
-			noRoot: value => value,
+		const source = entityPermissions.operations
+		const updateFields = (value: Acl.FieldPermissions, operation: Acl.Operation) => updater(value, entityName, operation)
+		// Carry every key over untouched by default, then rewrite the ones holding field names. An
+		// operation key that is not handled here must survive rather than disappear - the previous
+		// allow-list shape silently dropped `refreshMaterializedView` on every field rename.
+		const operations: Writable<Acl.EntityOperations> = { ...source }
+		if (source.create !== undefined) {
+			operations.create = updateFields(source.create, Acl.Operation.create)
+		}
+		if (source.update !== undefined) {
+			operations.update = updateFields(source.update, Acl.Operation.update)
 		}
-		const types: (keyof Acl.EntityOperations)[] = ['create', 'update', 'read', 'delete', 'customPrimary', 'noRoot']
-		for (const key of types) {
-			if (key in entityPermissions.operations) {
-				operations[key] = handlers[key](entityPermissions.operations[key] as any) as any
+		if (source.read !== undefined) {
+			operations.read = updateFields(source.read, Acl.Operation.read)
+		}
+		if (source.through !== undefined) {
+			const through: Writable<Acl.ThroughOperations> = { ...source.through }
+			if (source.through.create !== undefined) {
+				through.create = updateFields(source.through.create, Acl.Operation.create)
+			}
+			if (source.through.update !== undefined) {
+				through.update = updateFields(source.through.update, Acl.Operation.update)
+			}
+			if (source.through.read !== undefined) {
+				through.read = updateFields(source.through.read, Acl.Operation.read)
 			}
+			operations.through = through
 		}
 
 		return {

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

@@ -264,3 +264,71 @@ describe('rename a field carrying per-column index options', () =>
 		sql: SQL``,
 		noDiff: true,
 	}))
+
+// A field rename has to reach into the `through` bucket as well, and must not drop operation keys it
+// does not rewrite - the previous allow-list shape silently discarded `refreshMaterializedView`.
+describe('rename a field referenced by a through grant', () =>
+	testMigrations({
+		original: {
+			model: new SchemaBuilder()
+				.entity('Post', e => e.column('title'))
+				.buildSchema(),
+			acl: {
+				roles: {
+					editor: {
+						variables: {},
+						stages: '*',
+						entities: {
+							Post: {
+								predicates: {},
+								operations: {
+									read: { title: true },
+									refreshMaterializedView: true,
+									through: {
+										read: { title: true },
+										update: { title: true },
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		updated: {
+			model: new SchemaBuilder()
+				.entity('Post', e => e.column('heading', c => c.type(Model.ColumnType.String).columnName('title')))
+				.buildSchema(),
+			acl: {
+				roles: {
+					editor: {
+						variables: {},
+						stages: '*',
+						entities: {
+							Post: {
+								predicates: {},
+								operations: {
+									read: { heading: true },
+									refreshMaterializedView: true,
+									through: {
+										read: { heading: true },
+										update: { heading: true },
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		diff: [
+			{
+				modification: 'updateFieldName',
+				entityName: 'Post',
+				fieldName: 'title',
+				newFieldName: 'heading',
+			},
+		],
+		sql: SQL``,
+		noDiff: true,
+	}))