@contember/schema-migrations 2.0.0-alpha.18 → 2.0.0-alpha.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/schema-migrations",
-  "version": "2.0.0-alpha.18",
+  "version": "2.0.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.0.0-alpha.18",
-    "@contember/database-migrations": "2.0.0-alpha.18",
-    "@contember/engine-common": "2.0.0-alpha.18",
-    "@contember/schema": "2.0.0-alpha.18",
-    "@contember/schema-utils": "2.0.0-alpha.18",
+    "@contember/database": "2.0.0-alpha.20",
+    "@contember/database-migrations": "2.0.0-alpha.20",
+    "@contember/engine-common": "2.0.0-alpha.20",
+    "@contember/schema": "2.0.0-alpha.20",
+    "@contember/schema-utils": "2.0.0-alpha.20",
     "fast-deep-equal": "^3.1.3",
     "rfc6902": "^5.1.1"
   },
   "devDependencies": {
-    "@contember/schema-definition": "2.0.0-alpha.18"
+    "@contember/schema-definition": "2.0.0-alpha.20"
   },
   "peerDependencies": {
     "pg": "^8.9.0"

package/src/modifications/entities/RemoveEntityModification.ts

@@ -18,7 +18,7 @@ import {
 	ModificationHandlerOptions,
 } from '../ModificationHandler'
 import { VERSION_ACL_PATCH, VERSION_REMOVE_REFERENCING_RELATIONS } from '../ModificationVersions'
-import { isRelation, PredicateDefinitionProcessor } from '@contember/schema-utils'
+import { acceptEveryFieldVisitor, isRelation, PredicateDefinitionProcessor } from '@contember/schema-utils'
 import { removeFieldModification } from '../fields'
 
 export class RemoveEntityModificationHandler implements ModificationHandler<RemoveEntityModificationData> {
@@ -40,6 +40,17 @@ export class RemoveEntityModificationHandler implements ModificationHandler<Remo
 				removeFieldHandler.createSql(builder, options)
 			})
 		}
+		acceptEveryFieldVisitor(this.schema.model, entity, {
+			visitManyHasManyOwning: ({ relation }) => {
+				builder.dropTable(relation.joiningTable.tableName)
+			},
+			visitManyHasManyInverse: () => {},
+			visitColumn: () => {},
+			visitOneHasOneInverse: () => {},
+			visitOneHasOneOwning: () => {},
+			visitManyHasOne: () => {},
+			visitOneHasMany: () => {},
+		})
 		builder.dropTable(entity.tableName)
 	}
 

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

@@ -119,3 +119,77 @@ testMigrations('remove a view', {
 	sql: SQL`
 	DROP VIEW "author";`,
 })
+
+
+namespace EntityWithManyHasManyOriginalSchema {
+
+	export class Book {
+		title = def.stringColumn()
+		tags = def.manyHasMany(Tag, 'books')
+	}
+
+	export class Tag {
+		name = def.stringColumn()
+		books = def.manyHasManyInverse(Book, 'tags')
+	}
+}
+testMigrations('remove junction table, when both entities are removed', {
+	original: createSchema(EntityWithManyHasManyOriginalSchema),
+	updated: {},
+	diff: [
+		{
+			modification: 'removeEntity',
+			entityName: 'Book',
+		},
+		{
+			modification: 'removeEntity',
+			entityName: 'Tag',
+		},
+	],
+	sql: SQL`DROP TABLE "book_tags";
+DROP TABLE "book"; 
+DROP TABLE "tag";`,
+})
+
+
+namespace EntityWithManyHasManyUpdatedSchema {
+
+	export class Tag {
+		name = def.stringColumn()
+	}
+}
+testMigrations('remove junction table, when owning entity is removed', {
+	original: createSchema(EntityWithManyHasManyOriginalSchema),
+	updated: createSchema(EntityWithManyHasManyUpdatedSchema),
+	diff: [
+		{
+			modification: 'removeEntity',
+			entityName: 'Book',
+		},
+
+	],
+	sql: SQL`DROP TABLE "book_tags";
+DROP TABLE "book";`,
+})
+
+
+namespace EntityWithManyHasMany2UpdatedSchema {
+
+	export class Book {
+		title = def.stringColumn()
+	}
+}
+testMigrations('remove junction table, when inverse entity is removed', {
+	original: createSchema(EntityWithManyHasManyOriginalSchema),
+	updated: createSchema(EntityWithManyHasMany2UpdatedSchema),
+	diff: [
+		{
+			modification: 'removeEntity',
+			entityName: 'Tag',
+		},
+
+	],
+	sql: SQL`
+DROP TABLE "book_tags";
+DROP TABLE "tag";`,
+})