generator-jhipster 8.7.1 → 8.7.2

package/dist/generators/javascript/generators/bootstrap/command.d.ts

@@ -1,21 +1,22 @@
-/**
- * Copyright 2013-2024 the original author or authors from the JHipster project.
- *
- * This file is part of the JHipster project, see https://www.jhipster.tech/
- * for more information.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import type { JHipsterCommandDefinition } from '../../../../lib/command/index.js';
-declare const command: JHipsterCommandDefinition;
+declare const command: {
+    readonly configs: {
+        readonly packageJsonNodeEngine: {
+            readonly cli: {
+                readonly type: (val: any) => any;
+                readonly hide: true;
+            };
+            readonly scope: "storage";
+        };
+        readonly packageJsonType: {
+            readonly cli: {
+                readonly type: StringConstructor;
+                readonly hide: true;
+            };
+            readonly choices: readonly ["commonjs", "module"];
+            readonly default: "commonjs";
+            readonly scope: "storage";
+        };
+    };
+    readonly import: readonly [];
+};
 export default command;

package/dist/generators/javascript/generators/bootstrap/generator.d.ts

@@ -1,8 +1,7 @@
 import BaseApplicationGenerator from '../../../base-application/index.js';
 export default class BootstrapGenerator extends BaseApplicationGenerator {
-    constructor(args: any, options: any, features: any);
     beforeQueue(): Promise<void>;
-    get loading(): import("../../../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../../../lib/types/application/tasks.js").TaskParamWithApplicationDefaults<import("../../../base-application/index.js").Entity<import("../../../base-application/index.js").Field, never>, import("../../../../lib/types/application/application.js").ApplicationType<import("../../../base-application/index.js").Entity<import("../../../base-application/index.js").Field, never>>>, "loadNodeDependencies">;
+    get loading(): import("../../../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../../../lib/types/application/tasks.js").TaskParamWithApplicationDefaults<import("../../../base-application/index.js").Entity<import("../../../base-application/index.js").Field, never>, import("../../../../lib/types/application/application.js").ApplicationType<import("../../../base-application/index.js").Entity<import("../../../base-application/index.js").Field, never>>>, "loadNodeDependencies" | "jsExtensions">;
     get writing(): import("../../../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../../../lib/types/application/tasks.js").WritingTaskParam<import("../../../base-application/index.js").Entity<import("../../../base-application/index.js").Field, never>, import("../../../../lib/types/application/application.js").ApplicationType<import("../../../base-application/index.js").Entity<import("../../../base-application/index.js").Field, never>>>, "writing">;
     get postWriting(): import("../../../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../../../lib/types/application/tasks.js").PostWritingTaskParam<import("../../../base-application/index.js").Entity<import("../../../base-application/index.js").Field, never>, import("../../../../lib/types/application/application.js").ApplicationType<import("../../../base-application/index.js").Entity<import("../../../base-application/index.js").Field, never>>>, "addPrettierDependencies">;
 }

package/dist/generators/javascript/generators/bootstrap/generator.js

@@ -20,9 +20,6 @@ import { packageJson } from '../../../../lib/index.js';
 import BaseApplicationGenerator from '../../../base-application/index.js';
 import { GENERATOR_PROJECT_NAME } from '../../../generator-list.js';
 export default class BootstrapGenerator extends BaseApplicationGenerator {
-    constructor(args, options, features) {
-        super(args, options, { queueCommandTasks: true, ...features });
-    }
     async beforeQueue() {
         if (!this.fromBlueprint) {
             await this.composeWithBlueprints();
@@ -36,6 +33,12 @@ export default class BootstrapGenerator extends BaseApplicationGenerator {
             loadNodeDependencies({ application }) {
                 this.loadNodeDependenciesFromPackageJson(application.nodeDependencies, this.fetchFromInstalledJHipster('javascript', 'resources', 'package.json'));
             },
+            jsExtensions({ applicationDefaults, application }) {
+                applicationDefaults({
+                    cjsExtension: application.packageJsonTypeCommonjs ? '.js' : '.cjs',
+                    mjsExtension: application.packageJsonTypeCommonjs ? '.js' : '.mjs',
+                });
+            },
         });
     }
     get [BaseApplicationGenerator.LOADING]() {
@@ -57,14 +60,15 @@ export default class BootstrapGenerator extends BaseApplicationGenerator {
     get postWriting() {
         return this.asPostWritingTaskGroup({
             addPrettierDependencies({ application }) {
-                const { packageJsonNodeEngine, packageJsonType, dasherizedBaseName, projectDescription } = application;
+                const { packageJsonNodeEngine, packageJsonType, dasherizedBaseName, projectDescription, packageJsonScripts } = application;
+                this.packageJson.merge({ scripts: packageJsonScripts });
                 this.packageJson.defaults({
                     name: dasherizedBaseName,
                     version: '0.0.0',
                     description: projectDescription,
                     license: 'UNLICENSED',
                 });
-                if (packageJsonType) {
+                if (packageJsonType === 'module') {
                     this.packageJson.merge({ type: packageJsonType });
                 }
                 if (packageJsonNodeEngine) {

package/dist/generators/javascript/types.d.ts

@@ -1,3 +1,8 @@
+import type { ExportApplicationPropertiesFromCommand } from '../../lib/command/types.js';
+import type JavascriptBootstrapCommand from './generators/bootstrap/command.ts';
+
+type JavascriptBootstrapProperties = ExportApplicationPropertiesFromCommand<typeof JavascriptBootstrapCommand>;
+
 export type JavaScriptSourceType = {
   mergePrettierConfig?: (config: Record<string, unknown>) => void;
   addPrettierIgnore?: (newContent: string) => void;
@@ -6,10 +11,12 @@ export type JavaScriptSourceType = {
   addEslintConfig?: (opts: { import?: string | string[]; config?: string | string[] }) => void;
 };
 
-export type JavaScriptApplication = {
+export type JavaScriptApplication = JavascriptBootstrapProperties & {
   packageJsonNodeEngine?: boolean | string;
-  packageJsonType?: string;
   eslintConfigFile?: string;
+  cjsExtension?: string;
+  mjsExtension?: string;
+  packageJsonScripts: Record<string, string>;
 
   addPrettierExtensions?: (extensions: string[]) => void;
 };

package/dist/generators/kubernetes/command.d.ts

@@ -0,0 +1,12 @@
+declare const command: {
+    readonly configs: {
+        readonly jwtSecretKey: {
+            readonly cli: {
+                readonly type: StringConstructor;
+                readonly env: "JHI_JWT_SECRET_KEY";
+            };
+            readonly scope: "generator";
+        };
+    };
+};
+export default command;

package/dist/generators/kubernetes/command.js

@@ -0,0 +1,12 @@
+const command = {
+    configs: {
+        jwtSecretKey: {
+            cli: {
+                type: String,
+                env: 'JHI_JWT_SECRET_KEY',
+            },
+            scope: 'generator',
+        },
+    },
+};
+export default command;

package/dist/generators/kubernetes/index.d.ts

@@ -16,4 +16,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+export { default as command } from './command.js';
 export { default } from './generator.js';

package/dist/generators/kubernetes/index.js

@@ -16,4 +16,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+export { default as command } from './command.js';
 export { default } from './generator.js';

package/dist/generators/kubernetes-helm/index.d.ts

@@ -16,4 +16,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+export { default as command } from '../kubernetes/command.js';
 export { default } from './generator.js';

package/dist/generators/kubernetes-helm/index.js

@@ -16,4 +16,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+export { default as command } from '../kubernetes/command.js';
 export { default } from './generator.js';

package/dist/generators/kubernetes-knative/generator.d.ts

@@ -24,7 +24,7 @@ import { checkImages, configureImageNames, generateJwtSecret, loadFromYoRc } fro
  */
 export default class KubernetesKnativeGenerator extends BaseWorkspacesGenerator {
     beforeQueue(): Promise<void>;
-    get initializing(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/base/tasks.js").TaskParamWithControl, "sayHello" | "checkDocker" | "loadConfig" | "loadDockerDependenciesTask" | "checkKubernetes" | "checkHelm" | "setupKubernetesConstants" | "setupHelmConstants" | "existingDeployment" | "checkKnative" | "localInit">;
+    get initializing(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/base/tasks.js").TaskParamWithControl, "checkDocker" | "sayHello" | "loadConfig" | "loadDockerDependenciesTask" | "checkKubernetes" | "checkHelm" | "setupKubernetesConstants" | "setupHelmConstants" | "existingDeployment" | "checkKnative" | "localInit">;
     get prompting(): {
         askForPath: () => Promise<void>;
         askForApps: () => Promise<void>;

package/dist/generators/kubernetes-knative/index.d.ts

@@ -16,4 +16,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+export { default as command } from '../kubernetes/command.js';
 export { default } from './generator.js';

package/dist/generators/kubernetes-knative/index.js

@@ -16,4 +16,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+export { default as command } from '../kubernetes/command.js';
 export { default } from './generator.js';

package/dist/generators/languages/entity-files.d.ts

@@ -1,3 +1,4 @@
+import type LanguagesGenerator from './generator.js';
 /**
  * The default is to use a file path string. It implies use of the template method.
  * For any other config an object { file:.., method:.., template:.. } can be used
@@ -27,6 +28,6 @@ export declare const enumClientI18nFiles: {
     }[];
 };
 export declare function writeEntityFiles(): {
-    writeEnumFiles: (this: import("../index.js").GeneratorBaseCore, params: import("../../lib/types/application/tasks.js").TaskParamWithEntities<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>) => void;
-    writeClientFiles: (this: import("../index.js").GeneratorBaseCore, params: import("../../lib/types/application/tasks.js").TaskParamWithEntities<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>) => void;
+    writeEnumFiles: (this: LanguagesGenerator, params: import("../../lib/types/application/tasks.js").TaskParamWithEntities<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>) => void;
+    writeClientFiles: (this: LanguagesGenerator, params: import("../../lib/types/application/tasks.js").TaskParamWithEntities<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>) => void;
 };

package/dist/generators/languages/entity-files.js

@@ -1,4 +1,3 @@
-// @ts-nocheck
 /**
  * Copyright 2013-2024 the original author or authors from the JHipster project.
  *

package/dist/generators/languages/generator.d.ts

@@ -25,6 +25,7 @@ import BaseApplicationGenerator from '../base-application/index.js';
  */
 export default class LanguagesGenerator extends BaseApplicationGenerator {
     askForMoreLanguages: boolean;
+    askForNativeLanguage: boolean;
     translationData: any;
     supportedLanguages: any;
     languages: any;

package/dist/generators/languages/generator.js

@@ -42,6 +42,7 @@ const { NO: NO_CLIENT_FRAMEWORK, ANGULAR } = clientFrameworkTypes;
  */
 export default class LanguagesGenerator extends BaseApplicationGenerator {
     askForMoreLanguages;
+    askForNativeLanguage;
     translationData;
     supportedLanguages;
     languages;

package/dist/generators/liquibase/files.js

@@ -41,4 +41,12 @@ export const liquibaseFiles = {
             templates: ['config/liquibase/data/authority.csv'],
         },
     ],
+    graalvm: [
+        {
+            condition: ctx => ctx.graalvmSupport,
+            transform: false,
+            path: SERVER_MAIN_RES_DIR,
+            templates: ['META-INF/native-image/liquibase/reflect-config.json'],
+        },
+    ],
 };

package/dist/generators/liquibase/generator.d.ts

@@ -26,7 +26,7 @@ export default class LiquibaseGenerator extends BaseEntityChangesGenerator {
     } & {
         entityChanges?: import("../base-entity-changes/types.js").BaseChangelog[];
     }, "writeChangelogs">;
-    get postWriting(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").PostWritingTaskParam<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "customizeSpringLogs" | "customizeApplicationProperties" | "customizeMaven" | "injectGradle">;
+    get postWriting(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").PostWritingTaskParam<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "customizeMaven" | "nativeHints" | "customizeSpringLogs" | "customizeApplicationProperties" | "injectGradle">;
     get postWritingEntities(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/base/tasks.js").TaskParamWithControl & {
         application: import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>;
     } & {

package/dist/generators/liquibase/generator.js

@@ -436,6 +436,21 @@ export default class LiquibaseGenerator extends BaseEntityChangesGenerator {
                     }, { gradleFile: 'gradle/liquibase.gradle' });
                 }
             },
+            nativeHints({ source, application }) {
+                if (!application.graalvmSupport)
+                    return;
+                // Latest liquibase version supported by Reachability Repository is 4.23.0
+                // Hints may be dropped if newer version is supported
+                // https://github.com/oracle/graalvm-reachability-metadata/blob/master/metadata/org.liquibase/liquibase-core/index.json
+                source.addNativeHint({
+                    resources: ['config/liquibase/*'],
+                    declaredConstructors: [
+                        'liquibase.database.LiquibaseTableNamesFactory.class',
+                        'liquibase.report.ShowSummaryGeneratorFactory.class',
+                    ],
+                    publicConstructors: ['liquibase.ui.LoggerUIService.class'],
+                });
+            },
         });
     }
     get [BaseEntityChangesGenerator.POST_WRITING]() {

package/dist/generators/liquibase/templates/src/main/resources/META-INF/native-image/liquibase/reflect-config.json

@@ -0,0 +1,145 @@
+[
+  {
+    "name": "liquibase.logging.mdc.MdcManagerFactory",
+    "methods": [{ "name": "<init>", "parameterTypes": [] }]
+  },
+  {
+    "name": "liquibase.change.core.LoadDataColumnConfig",
+    "queryAllPublicMethods": true,
+    "allDeclaredMethods": true,
+    "methods": [{ "name": "<init>", "parameterTypes": [] }]
+  },
+  {
+    "name": "liquibase.command.CommandFactory",
+    "methods": [{ "name": "<init>", "parameterTypes": [] }]
+  },  
+  {
+    "name": "liquibase.changelog.ChangeLogHistoryServiceFactory",
+    "methods": [{ "name": "<init>", "parameterTypes": [] }]
+  },
+  {
+    "name": "liquibase.datatype.core.BigIntType",
+    "allPublicMethods": true,
+    "methods": [{ "name": "<init>", "parameterTypes": [] }]
+  },
+  {
+    "name": "liquibase.datatype.core.BlobType",
+    "allPublicMethods": true,
+    "methods": [{ "name": "<init>", "parameterTypes": [] }]
+  },
+  {
+    "name": "liquibase.datatype.core.BooleanType",
+    "allPublicMethods": true,
+    "methods": [{ "name": "<init>", "parameterTypes": [] }]
+  },
+  {
+    "name": "liquibase.datatype.core.CharType",
+    "allPublicMethods": true,
+    "methods": [{ "name": "<init>", "parameterTypes": [] }]
+  },
+  {
+    "name": "liquibase.datatype.core.ClobType",
+    "allPublicMethods": true,
+    "methods": [{ "name": "<init>", "parameterTypes": [] }]
+  },
+  {
+    "name": "liquibase.datatype.core.CurrencyType",
+    "allPublicMethods": true,
+    "methods": [{ "name": "<init>", "parameterTypes": [] }]
+  },
+  {
+    "name": "liquibase.datatype.core.DatabaseFunctionType",
+    "allPublicMethods": true,
+    "methods": [{ "name": "<init>", "parameterTypes": [] }]
+  },
+  {
+    "name": "liquibase.datatype.core.DateTimeType",
+    "allPublicMethods": true,
+    "methods": [{ "name": "<init>", "parameterTypes": [] }]
+  },
+  {
+    "name": "liquibase.datatype.core.DateType",
+    "allPublicMethods": true,
+    "methods": [{ "name": "<init>", "parameterTypes": [] }]
+  },
+  {
+    "name": "liquibase.datatype.core.DecimalType",
+    "allPublicMethods": true,
+    "methods": [{ "name": "<init>", "parameterTypes": [] }]
+  },
+  {
+    "name": "liquibase.datatype.core.DoubleType",
+    "allPublicMethods": true,
+    "methods": [{ "name": "<init>", "parameterTypes": [] }]
+  },
+  {
+    "name": "liquibase.datatype.core.FloatType",
+    "allPublicMethods": true,
+    "methods": [{ "name": "<init>", "parameterTypes": [] }]
+  },
+  {
+    "name": "liquibase.datatype.core.IntType",
+    "allPublicMethods": true,
+    "methods": [{ "name": "<init>", "parameterTypes": [] }]
+  },
+  {
+    "name": "liquibase.datatype.core.MediumIntType",
+    "allPublicMethods": true,
+    "methods": [{ "name": "<init>", "parameterTypes": [] }]
+  },
+  {
+    "name": "liquibase.datatype.core.NCharType",
+    "allPublicMethods": true,
+    "methods": [{ "name": "<init>", "parameterTypes": [] }]
+  },
+  {
+    "name": "liquibase.datatype.core.NumberType",
+    "allPublicMethods": true,
+    "methods": [{ "name": "<init>", "parameterTypes": [] }]
+  },
+  {
+    "name": "liquibase.datatype.core.NVarcharType",
+    "allPublicMethods": true,
+    "methods": [{ "name": "<init>", "parameterTypes": [] }]
+  },
+  {
+    "name": "liquibase.datatype.core.SmallIntType",
+    "allPublicMethods": true,
+    "methods": [{ "name": "<init>", "parameterTypes": [] }]
+  },
+  {
+    "name": "liquibase.datatype.core.TimestampType",
+    "allPublicMethods": true,
+    "methods": [{ "name": "<init>", "parameterTypes": [] }]
+  },
+  {
+    "name": "liquibase.datatype.core.TimeType",
+    "allPublicMethods": true,
+    "methods": [{ "name": "<init>", "parameterTypes": [] }]
+  },
+  {
+    "name": "liquibase.datatype.core.TinyIntType",
+    "allPublicMethods": true,
+    "methods": [{ "name": "<init>", "parameterTypes": [] }]
+  },
+  {
+    "name": "liquibase.datatype.core.UnknownType",
+    "allPublicMethods": true,
+    "methods": [{ "name": "<init>", "parameterTypes": [] }]
+  },
+  {
+    "name": "liquibase.datatype.core.UUIDType",
+    "allPublicMethods": true,
+    "methods": [{ "name": "<init>", "parameterTypes": [] }]
+  },
+  {
+    "name": "liquibase.datatype.core.VarcharType",
+    "allPublicMethods": true,
+    "methods": [{ "name": "<init>", "parameterTypes": [] }]
+  },
+  {
+    "name": "liquibase.datatype.core.XMLType",
+    "allPublicMethods": true,
+    "methods": [{ "name": "<init>", "parameterTypes": [] }]
+  }
+]

package/dist/generators/liquibase/templates/src/main/resources/config/liquibase/changelog/add_relationship_constraints.ejs

@@ -0,0 +1,81 @@
+<%#
+ Copyright 2013-2024 the original author or authors from the JHipster project.
+
+ This file is part of the JHipster project, see https://www.jhipster.tech/
+ for more information.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-%>
+<%_
+const relationshipType = relationship.relationshipType,
+relationshipName = relationship.relationshipName,
+ownerSide = relationship.ownerSide,
+otherEntityTableName = relationship.otherEntityTableName,
+onDelete = relationship.onDelete, 
+onUpdate = relationship.onUpdate;
+if (relationshipType === 'many-to-one' || (relationshipType === 'one-to-one' && ownerSide)) {
+    const constraintName = this.getFKConstraintName(entity.entityTableName, relationshipName, prodDatabaseType);
+    let baseColumnNames;
+    let referencedColumnNames;
+    if (relationshipType === 'one-to-one' && ownerSide && relationship.id === true) {
+        baseColumnNames = relationship.otherEntity.primaryKey.fields.map(field => field.columnName).join(',');
+        referencedColumnNames = relationship.otherEntity.primaryKey.fields.map(field => field.columnName).join(',');
+    } else if (relationship.otherEntity) {
+        baseColumnNames = relationship.otherEntity.primaryKey.fields.map(field => relationship.columnName + '_' + field.columnName).join(',');
+        referencedColumnNames = relationship.otherEntity.primaryKey.fields.map(field => field.columnName).join(',');
+    } _%>
+
+        <addForeignKeyConstraint baseColumnNames="<%= baseColumnNames %>"
+                                 baseTableName="<%= entity.entityTableName %>"
+                                 constraintName="<%= constraintName %>"
+                                 referencedColumnNames="<%= referencedColumnNames %>"
+                                 referencedTableName="<%= otherEntityTableName %>"
+        <%_ if (onDelete) { _%>                                 
+                                 onDelete="<%= onDelete %>"
+        <%_ } _%>
+        <%_ if (onUpdate) { _%>
+                                 onUpdate="<%= onUpdate %>"
+        <%_ } _%>
+                                 />
+<%_ } else if (relationship.shouldWriteJoinTable) { _%>
+
+        <addForeignKeyConstraint baseColumnNames="<%= entity.primaryKey.fields.map(field => entity.entityTableName + '_' + field.columnName).join(', ') %>"
+                                 baseTableName="<%= relationship.joinTable.name %>"
+                                 constraintName="<%= relationship.joinTable.constraintName %>"
+                                 referencedColumnNames="<%= entity.primaryKey.fields.map(field => field.columnName).join(', ') %>"
+                                 referencedTableName="<%= entity.entityTableName %>"
+        <%_ if (onDelete) { _%>                                 
+                                 onDelete="<%= onDelete %>"
+        <%_ } _%>
+        <%_ if (onUpdate) { _%>
+                                 onUpdate="<%= onUpdate %>"
+        <%_ } _%>
+                                 />
+
+        <addForeignKeyConstraint baseColumnNames="<%= relationship.otherEntity.primaryKey.fields.map(field => relationship.columnName + '_' + field.columnName).join(', ') %>"
+                                 baseTableName="<%= relationship.joinTable.name %>"
+                                 constraintName="<%= relationship.joinTable.otherConstraintName %>"
+                                 referencedColumnNames="<%= relationship.otherEntity.primaryKey.fields.map(field => field.columnName).join(', ') %>"
+                                 referencedTableName="<%= relationship.otherEntity.entityTableName %>"
+        <%_ if (relationship.otherRelationship) { 
+            // User object is not supporting this right now
+            _%>
+            <%_ if (relationship.otherRelationship.onDelete) { _%>                                 
+                                 onDelete="<%= relationship.otherRelationship.onDelete %>"
+            <%_ } _%>
+            <%_ if (relationship.otherRelationship.onUpdate) { _%>
+                                 onUpdate="<%= relationship.otherRelationship.onUpdate %>"
+            <%_ } _%>
+        <%_ } _%>
+                                 />
+<%_ } _%>

package/dist/generators/liquibase/templates/src/main/resources/config/liquibase/changelog/added_entity_constraints.xml.ejs

@@ -21,68 +21,8 @@
         Added the constraints for entity <%= entity.entityClass %>.
     -->
     <changeSet id="<%= changelogDate %>-2" author="jhipster">
-<% for (relationship of relationships) {
-    const relationshipType = relationship.relationshipType,
-    relationshipName = relationship.relationshipName,
-    ownerSide = relationship.ownerSide,
-    otherEntityTableName = relationship.otherEntityTableName,
-    onDelete = relationship.onDelete, 
-    onUpdate = relationship.onUpdate;
-    if (relationshipType === 'many-to-one' || (relationshipType === 'one-to-one' && ownerSide)) {
-        const constraintName = this.getFKConstraintName(entity.entityTableName, relationshipName, prodDatabaseType);
-        let baseColumnNames;
-        let referencedColumnNames;
-        if (relationshipType === 'one-to-one' && ownerSide && relationship.id === true) {
-            baseColumnNames = relationship.otherEntity.primaryKey.fields.map(field => field.columnName).join(',');
-            referencedColumnNames = relationship.otherEntity.primaryKey.fields.map(field => field.columnName).join(',');
-        } else if (relationship.otherEntity) {
-            baseColumnNames = relationship.otherEntity.primaryKey.fields.map(field => relationship.columnName + '_' + field.columnName).join(',');
-            referencedColumnNames = relationship.otherEntity.primaryKey.fields.map(field => field.columnName).join(',');
-        } %>
-        <addForeignKeyConstraint baseColumnNames="<%= baseColumnNames %>"
-                                 baseTableName="<%= entity.entityTableName %>"
-                                 constraintName="<%= constraintName %>"
-                                 referencedColumnNames="<%= referencedColumnNames %>"
-                                 referencedTableName="<%= otherEntityTableName %>"
-            <%_ if (onDelete) { _%>                                 
-                                 onDelete="<%= onDelete %>"
-            <%_ } _%>
-            <%_ if (onUpdate) { _%>
-                                 onUpdate="<%= onUpdate %>"
-            <%_ } _%>
-                                 />
-    <%_ } else if (relationship.shouldWriteJoinTable) { _%>
-
-        <addForeignKeyConstraint baseColumnNames="<%= entity.primaryKey.fields.map(field => entity.entityTableName + '_' + field.columnName).join(', ') %>"
-                                 baseTableName="<%= relationship.joinTable.name %>"
-                                 constraintName="<%= relationship.joinTable.constraintName %>"
-                                 referencedColumnNames="<%= entity.primaryKey.fields.map(field => field.columnName).join(', ') %>"
-                                 referencedTableName="<%= entity.entityTableName %>"
-            <%_ if (onDelete) { _%>                                 
-                                 onDelete="<%= onDelete %>"
-            <%_ } _%>
-            <%_ if (onUpdate) { _%>
-                                 onUpdate="<%= onUpdate %>"
-            <%_ } _%>
-                                 />
-
-        <addForeignKeyConstraint baseColumnNames="<%= relationship.otherEntity.primaryKey.fields.map(field => relationship.columnName + '_' + field.columnName).join(', ') %>"
-                                 baseTableName="<%= relationship.joinTable.name %>"
-                                 constraintName="<%= relationship.joinTable.otherConstraintName %>"
-                                 referencedColumnNames="<%= relationship.otherEntity.primaryKey.fields.map(field => field.columnName).join(', ') %>"
-                                 referencedTableName="<%= relationship.otherEntity.entityTableName %>"
-            <%_ if (relationship.otherRelationship) { 
-                // User object is not supporting this right now
-                _%>
-                <%_ if (relationship.otherRelationship.onDelete) { _%>                                 
-                                 onDelete="<%= relationship.otherRelationship.onDelete %>"
-                <%_ } _%>
-                <%_ if (relationship.otherRelationship.onUpdate) { _%>
-                                 onUpdate="<%= relationship.otherRelationship.onUpdate %>"
-                <%_ } _%>
-            <%_ } _%>
-                                 />
-    <%_ } _%>
+<%_ for (relationship of relationships) { _%>
+<%- include('./add_relationship_constraints', { entity, relationship, prodDatabaseType }) -%>
 <%_ } _%>
     </changeSet>
 </databaseChangeLog>