@contember/schema-migrations 2.0.0-beta.2 → 2.0.0-beta.4

package/package.json

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

package/src/modifications/ModificationVersions.ts

@@ -1,5 +1,5 @@
 export const VERSION_INITIAL = 1
-export const VERSION_LATEST = 5
+export const VERSION_LATEST = 6
 
 export const VERSION_ACL_PATCH = 2
 export const VERSION_UPDATE_CONSTRAINT_FIELDS = 2
@@ -7,3 +7,4 @@ export const VERSION_REMOVE_RELATION_INVERSE_SIDE = 3
 export const VERSION_REMOVE_REFERENCING_RELATIONS = 3
 export const _REMOVED_VERSION_UPDATE_CONSTRAINT_NAME_ONE_HAS_ONE = 4
 export const VERSION_UPDATE_INDEX_FIELDS = 5
+export const VERSION_CORRECT_PRIMARY_COLUMN_NAME = 6

package/src/modifications/entities/CreateEntityModification.ts

@@ -10,6 +10,7 @@ import {
 import { createEventTrigger, createEventTrxTrigger } from '../utils/sqlUpdateUtils'
 import { PossibleEntityShapeInMigrations } from '../../utils/PartialEntity.js'
 import { getColumnSqlType } from '../utils/columnUtils'
+import { VERSION_CORRECT_PRIMARY_COLUMN_NAME } from '../ModificationVersions'
 
 export class CreateEntityModificationHandler implements ModificationHandler<CreateEntityModificationData> {
 	constructor(
@@ -27,8 +28,11 @@ export class CreateEntityModificationHandler implements ModificationHandler<Crea
 		}
 		const primaryColumn = entity.fields[entity.primary] as Model.AnyColumn
 
+		const primaryColumnName = this.options.formatVersion >= VERSION_CORRECT_PRIMARY_COLUMN_NAME
+			? primaryColumn.columnName
+			: primaryColumn.name
 		builder.createTable(entity.tableName, {
-			[primaryColumn.name]: {
+			[primaryColumnName]: {
 				primaryKey: true,
 				type: getColumnSqlType(primaryColumn),
 				notNull: true,

package/src/modifications/utils/schemaUpdateUtils.ts

@@ -119,8 +119,9 @@ export const updateAclFieldPermissions =
 				read: value => updater(value, entityName, Acl.Operation.read),
 				delete: value => value,
 				customPrimary: value => value,
+				noRoot: value => value,
 			}
-			const types: (keyof Acl.EntityOperations)[] = ['create', 'update', 'read', 'delete', 'customPrimary']
+			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

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

@@ -148,3 +148,54 @@ describe('create a view', () => testMigrations({
 	],
 	sql: SQL`CREATE VIEW "author" AS SELECT null as id, 'John' AS name;`,
 }))
+
+namespace SchemaWithCustomIdName {
+	export class Author {
+		id = def.uuidColumn().notNull().columnName('author_id')
+		name = def.stringColumn()
+	}
+}
+describe('custom primary key name', () => testMigrations({
+	original: {},
+	updated: createSchema(SchemaWithCustomIdName),
+	diff: [
+		{
+			modification: 'createEntity',
+			entity: {
+				fields: {
+					id: {
+						columnName: 'author_id',
+						name: 'id',
+						nullable: false,
+						type: Model.ColumnType.Uuid,
+						columnType: 'uuid',
+					},
+				},
+				name: 'Author',
+				primary: 'id',
+				primaryColumn: 'author_id',
+				tableName: 'author',
+				unique: [],
+				eventLog: {
+					enabled: true,
+				},
+				indexes: [],
+			},
+		},
+		{
+			modification: 'createColumn',
+			entityName: 'Author',
+			field: {
+				columnName: 'name',
+				name: 'name',
+				nullable: true,
+				type: Model.ColumnType.String,
+				columnType: 'text',
+			},
+		},
+	],
+	sql: SQL`CREATE TABLE "author" ( "author_id" uuid PRIMARY KEY NOT NULL ); 
+CREATE TRIGGER "log_event" AFTER INSERT OR UPDATE OR DELETE ON "author" FOR EACH ROW EXECUTE PROCEDURE "system"."trigger_event"($pga$author_id$pga$); 
+CREATE CONSTRAINT TRIGGER "log_event_trx" AFTER INSERT OR UPDATE OR DELETE ON "author" DEFERRABLE INITIALLY DEFERRED FOR EACH ROW EXECUTE PROCEDURE "system"."trigger_event_commit"(); 
+ALTER TABLE "author" ADD "name" text;`,
+}))