adjusts

mshima · Nov 23, 2023 · 058a76a · 058a76a
1 parent 02b8fb8
commit 058a76a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/generators/base-application/support/prepare-relationship.mjs b/generators/base-application/support/prepare-relationship.mjs
@@ -49,7 +49,6 @@ export default function prepareRelationship(entityWithConfig, relationship, gene
   const entityName = entityWithConfig.name;
   const otherEntityName = relationship.otherEntityName;
   const jhiTablePrefix = entityWithConfig.jhiTablePrefix || hibernateSnakeCase(entityWithConfig.jhiPrefix);
-  const databaseType = entityWithConfig.databaseType;
 
   if (!relationship.otherEntity) {
     throw new Error(
@@ -77,8 +76,7 @@ export default function prepareRelationship(entityWithConfig, relationship, gene
     // means that this side should control the reference.
     ownerSide: ({ ownerSide, relationshipLeftSide, relationshipManyToOne, relationshipOneToMany }) =>
       ownerSide ?? (relationshipManyToOne || (relationshipLeftSide && !relationshipOneToMany)),
-    persistableRelationship: ({ persistableRelationship, ownerSide, relationshipManyToMany }) =>
-      persistableRelationship ?? (databaseType === 'neo4j' || ownerSide || relationshipManyToMany),
+    persistableRelationship: ({ persistableRelationship, ownerSide }) => persistableRelationship ?? ownerSide,
     relationshipUpdateBackReference: ({ relationshipUpdateBackReference, ownerSide, relationshipRightSide }) =>
       relationshipUpdateBackReference ?? (entityWithConfig.databaseType === 'neo4j' ? relationshipRightSide : !ownerSide),
   });

diff --git a/generators/spring-data-relational/generator.mts b/generators/spring-data-relational/generator.mts
@@ -86,6 +86,23 @@ export default class SqlGenerator extends BaseApplicationGenerator<SpringBootGen
     return this.delegateTasksToBlueprint(() => this.preparing);
   }
 
+  get preparingEachEntity() {
+    return this.asPreparingEachEntityTaskGroup({
+      prepareEntity({ entity }) {
+        entity.relationships.forEach(relationship => {
+          if (relationship.persistableRelationship === undefined) {
+            // This is a v8.1 behavior, make it default if blueprints adopts it.
+            relationship.persistableRelationship = relationship.ownerSide || relationship.relationshipManyToMany;
+          }
+        });
+      },
+    });
+  }
+
+  get [BaseApplicationGenerator.PREPARING_EACH_ENTITY]() {
+    return this.delegateTasksToBlueprint(() => this.preparingEachEntity);
+  }
+
   get preparingEachEntityRelationship() {
     return this.asPreparingEachEntityRelationshipTaskGroup({
       prepareRelationship({ application, relationship }) {