generator-jhipster 7.8.1 → 7.9.2

package/generators/server/cleanup-sql.js

@@ -0,0 +1,48 @@
+/**
+ * Copyright 2013-2022 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.
+ */
+/**
+ * Removes server files that where generated in previous JHipster versions and therefore
+ * need to be removed.
+ *
+ * @param {any} generator - reference to generator
+ * @param {string} javaDir - Java directory
+ * @param {string} testDir - Java tests directory
+ * @param {string} mainResourceDir - Main resources directory
+ * @param {string} testResourceDir - Test resources directory
+ */
+function cleanupOldServerFiles(generator, javaDir, testDir, mainResourceDir, testResourceDir) {
+  if (generator.isJhipsterVersionLessThan('4.0.0')) {
+    if (generator.devDatabaseTypeH2Any) {
+      generator.removeFile(`${javaDir}domain/util/FixedH2Dialect.java`);
+    }
+    if (generator.devDatabaseTypePostgres || generator.prodDatabaseTypePostgres) {
+      generator.removeFile(`${javaDir}domain/util/FixedPostgreSQL82Dialect`);
+    }
+  }
+  if (generator.isJhipsterVersionLessThan('7.8.2')) {
+    generator.removeFile(`${testResourceDir}config/application-testcontainers.yml`);
+    if (generator.reactive) {
+      generator.removeFile(`${testDir}ReactiveSqlTestContainerExtension.java`);
+    }
+  }
+}
+
+module.exports = {
+  cleanupOldServerFiles,
+};

package/generators/server/cleanup.js

@@ -1,3 +1,35 @@
+/**
+ * Copyright 2013-2022 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 cleanupCassandra = require('./cleanup-cassandra');
+const cleanupMongodb = require('./cleanup-mongodb');
+const cleanupSql = require('./cleanup-sql');
+const cleanupElasticsearch = require('./cleanup-elasticsearch');
+const cleanupCacheProvider = require('./cleanup-cache-provider');
+const cleanupAngular = require('./cleanup-angular');
+const cleanupGradle = require('./cleanup-gradle');
+const cleanupOauth2 = require('./cleanup-oauth2');
+const cleanupKafka = require('./cleanup-kafka');
+const cleanupReactive = require('./cleanup-reactive');
+const cleanupCucumber = require('./cleanup-cucumber');
+const cleanupMaven = require('./cleanup-maven');
+const constants = require('../generator-constants');
+
 /**
  * Removes server files that where generated in previous JHipster versions and therefore
  * need to be removed.
@@ -8,11 +40,43 @@
  * @param {string} mainResourceDir - Main resources directory
  * @param {string} testResourceDir - Test resources directory
  */
-const { CASSANDRA, MONGODB } = require('../../jdl/jhipster/database-types');
-const { ELASTICSEARCH } = require('../../jdl/jhipster/search-engine-types');
-const { KAFKA } = require('../../jdl/jhipster/message-broker-types');
-
 function cleanupOldServerFiles(generator, javaDir, testDir, mainResourceDir, testResourceDir) {
+  if (generator.databaseTypeSql) {
+    cleanupSql.cleanupOldServerFiles(generator, javaDir, testDir, mainResourceDir, testResourceDir);
+  }
+  if (generator.databaseTypeCassandra) {
+    cleanupCassandra.cleanupOldServerFiles(generator, javaDir, testDir, mainResourceDir, testResourceDir);
+  }
+  if (generator.databaseTypeMongodb) {
+    cleanupMongodb.cleanupOldServerFiles(generator, javaDir, testDir, mainResourceDir, testResourceDir);
+  }
+  cleanupCacheProvider.cleanupOldServerFiles(generator, javaDir, testDir, mainResourceDir, testResourceDir);
+  if (generator.clientFrameworkAngular) {
+    cleanupAngular.cleanupOldServerFiles(generator, javaDir, testDir, mainResourceDir, testResourceDir);
+  }
+  if (generator.searchEngineElasticsearch) {
+    cleanupElasticsearch.cleanupOldServerFiles(generator, javaDir, testDir, mainResourceDir, testResourceDir);
+  }
+  if (generator.buildToolGradle) {
+    cleanupGradle.cleanupOldServerFiles(generator, javaDir, testDir, mainResourceDir, testResourceDir);
+  }
+  if (generator.buildToolMaven) {
+    cleanupMaven.cleanupOldServerFiles(generator, javaDir, testDir, mainResourceDir, testResourceDir);
+  }
+  if (generator.authenticationTypeOauth2) {
+    cleanupOauth2.cleanupOldServerFiles(generator, javaDir, testDir, mainResourceDir, testResourceDir);
+  }
+  if (generator.messageBrokerKafka) {
+    cleanupKafka.cleanupOldServerFiles(generator, javaDir, testDir, mainResourceDir, testResourceDir);
+  }
+  if (generator.reactive) {
+    cleanupReactive.cleanupOldServerFiles(generator, javaDir, testDir, mainResourceDir, testResourceDir);
+  }
+
+  if (generator.cucumberTests) {
+    cleanupCucumber.cleanupOldServerFiles(generator, javaDir, testDir, mainResourceDir, testResourceDir);
+  }
+
   if (generator.isJhipsterVersionLessThan('3.5.0')) {
     generator.removeFile(`${javaDir}domain/util/JSR310DateTimeSerializer.java`);
     generator.removeFile(`${javaDir}domain/util/JSR310LocalDateDeserializer.java`);
@@ -21,31 +85,21 @@ function cleanupOldServerFiles(generator, javaDir, testDir, mainResourceDir, tes
     generator.removeFile(`${javaDir}config/HerokuDatabaseConfiguration.java`);
   }
   if (generator.isJhipsterVersionLessThan('3.10.0')) {
-    generator.removeFile(`${javaDir}config/CloudMongoDbConfiguration.java`);
     generator.removeFile(`${javaDir}security/CustomAccessDeniedHandler.java`);
     generator.removeFile(`${javaDir}web/filter/CsrfCookieGeneratorFilter.java`);
   }
-  if (generator.isJhipsterVersionLessThan('3.12.0')) {
-    generator.removeFile(`${javaDir}config/hazelcast/HazelcastCacheRegionFactory.java`);
-    generator.removeFile(`${javaDir}config/hazelcast/package-info.java`);
-  }
   if (generator.isJhipsterVersionLessThan('4.0.0')) {
     generator.removeFile(`${javaDir}async/ExceptionHandlingAsyncTaskExecutor.java`);
     generator.removeFile(`${javaDir}async/package-info.java`);
     generator.removeFile(`${javaDir}config/jHipsterProperties.java`);
     generator.removeFile(`${javaDir}config/LoadBalancedResourceDetails.java`);
-    generator.removeFile(`${javaDir}config/ElasticSearchConfiguration.java`);
     generator.removeFile(`${javaDir}config/apidoc/package-info.java`);
     generator.removeFile(`${javaDir}config/apidoc/PageableParameterBuilderPlugin.java`);
     generator.removeFile(`${javaDir}config/apidoc/SwaggerConfiguration.java`);
     generator.removeFile(`${javaDir}config/jcache/SpringCacheRegionFactory.java`);
-    generator.removeFile(`${javaDir}config/jcache/SpringCacheRegionFactory.java`);
     generator.removeFile(`${javaDir}config/liquibase/AsyncSpringLiquibase.java`);
     generator.removeFile(`${javaDir}config/liquibase/package-info.java`);
-    generator.removeFile(`${javaDir}config/locale/AngularCookieLocaleResolver.java`);
     generator.removeFile(`${javaDir}config/locale/package-info.java`);
-    generator.removeFile(`${javaDir}domain/util/FixedH2Dialect.java`);
-    generator.removeFile(`${javaDir}domain/util/FixedPostgreSQL82Dialect`);
     generator.removeFile(`${javaDir}domain/util/JSR310DateConverters.java`);
     generator.removeFile(`${javaDir}domain/util/JSR310PersistenceConverters.java`);
     generator.removeFile(`${javaDir}security/AjaxAuthenticationFailureHandler.java`);
@@ -59,7 +113,6 @@ function cleanupOldServerFiles(generator, javaDir, testDir, mainResourceDir, tes
   }
   if (generator.isJhipsterVersionLessThan('4.3.0')) {
     generator.removeFile(`${javaDir}gateway/ratelimiting/RateLimitingRepository.java`);
-    generator.removeFile(`${javaDir}config/cassandra/CustomZonedDateTimeCodec.java`);
   }
   if (generator.isJhipsterVersionLessThan('4.7.1')) {
     generator.removeFile(`${javaDir}web/rest/errors/ErrorVM.java`);
@@ -74,17 +127,9 @@ function cleanupOldServerFiles(generator, javaDir, testDir, mainResourceDir, tes
     generator.removeFile(`${mainResourceDir}mails/socialRegistrationValidationEmail.html`);
     generator.removeFile(`${testResourceDir}mail/testEmail.html`);
     generator.removeFile(`${testDir}web/rest/ProfileInfoResourceIT.java`);
-    generator.removeFile('gradle/mapstruct.gradle');
-  }
-  if (generator.isJhipsterVersionLessThan('5.2.2')) {
-    generator.removeFile(`${javaDir}config/ElasticsearchConfiguration.java`);
-    generator.removeFile('gradle/liquibase.gradle');
   }
   if (generator.isJhipsterVersionLessThan('5.8.0')) {
     generator.removeFile(`${javaDir}config/MetricsConfiguration.java`);
-    if (generator.databaseType === CASSANDRA) {
-      generator.removeFile(`${testResourceDir}cassandra-random-port.yml`);
-    }
   }
   if (generator.isJhipsterVersionLessThan('6.0.0')) {
     generator.removeFile(`${javaDir}web/rest/errors/CustomParameterizedException.java`);
@@ -95,13 +140,9 @@ function cleanupOldServerFiles(generator, javaDir, testDir, mainResourceDir, tes
     generator.removeFile(`${javaDir}web/rest/vm/LoggerVM.java`);
     generator.removeFile(`${javaDir}web/rest/LogsResource.java`);
     generator.removeFile(`${testDir}web/rest/LogsResourceIT.java`);
-    generator.removeFile(`${javaDir}config/OAuth2Configuration.java`);
-    generator.removeFile(`${javaDir}security/OAuth2AuthenticationSuccessHandler.java`);
   }
   if (generator.isJhipsterVersionLessThan('6.5.2')) {
     generator.removeFile(`${testDir}service/mapper/UserMapperIT.java`);
-    generator.removeFile(`${javaDir}service/${generator.upperFirstCamelCase(generator.baseName)}KafkaConsumer.java`);
-    generator.removeFile(`${javaDir}service/${generator.upperFirstCamelCase(generator.baseName)}KafkaProducer.java`);
     generator.removeFile(`${testDir}web/rest/ClientForwardControllerIT.java`);
   }
   if (generator.isJhipsterVersionLessThan('6.6.1')) {
@@ -112,12 +153,10 @@ function cleanupOldServerFiles(generator, javaDir, testDir, mainResourceDir, tes
   if (generator.isJhipsterVersionLessThan('6.8.0')) {
     generator.removeFile(`${javaDir}security/oauth2/JwtAuthorityExtractor.java`);
   }
-  if (generator.isJhipsterVersionLessThan('6.8.1')) {
-    generator.removeFile(`${javaDir}config/ReactivePageableHandlerMethodArgumentResolver.java`);
-    generator.removeFile(`${javaDir}config/ReactiveSortHandlerMethodArgumentResolver.java`);
-  }
   if (generator.isJhipsterVersionLessThan('7.0.0-beta.0')) {
     generator.removeFile(`${javaDir}config/apidoc/SwaggerConfiguration.java`);
+    generator.removeFile(`${javaDir}config/metrics/package-info.java`);
+    generator.removeFile(`${javaDir}config/metrics/JHipsterHealthIndicatorConfiguration.java`);
     generator.removeFile(`${javaDir}config/audit/package-info.java`);
     generator.removeFile(`${javaDir}config/audit/AuditEventConverter.java`);
     generator.removeFile(`${javaDir}domain/PersistentAuditEvent.java`);
@@ -128,18 +167,6 @@ function cleanupOldServerFiles(generator, javaDir, testDir, mainResourceDir, tes
     generator.removeFile(`${testDir}service/AuditEventServiceIT.java`);
     generator.removeFile(`${testDir}web/rest/AuditResourceIT.java`);
     generator.removeFile(`${testDir}repository/CustomAuditEventRepositoryIT.java`);
-
-    if (generator.databaseType === CASSANDRA) {
-      generator.removeFile(`${javaDir}config/metrics/package-info.java`);
-      generator.removeFile(`${javaDir}config/metrics/CassandraHealthIndicator.java`);
-      generator.removeFile(`${javaDir}config/metrics/JHipsterHealthIndicatorConfiguration.java`);
-      generator.removeFile(`${javaDir}config/cassandra/package-info.java`);
-      generator.removeFile(`${javaDir}config/cassandra/CassandraConfiguration.java`);
-      generator.removeFile(`${testDir}config/CassandraConfigurationIT.java`);
-    }
-    if (generator.searchEngine === ELASTICSEARCH) {
-      generator.removeFile(`${testDir}config/ElasticsearchTestConfiguration.java`);
-    }
   }
   if (generator.isJhipsterVersionLessThan('7.0.0-beta.1')) {
     generator.removeFile(`${javaDir}config/CloudDatabaseConfiguration.java`);
@@ -148,18 +175,25 @@ function cleanupOldServerFiles(generator, javaDir, testDir, mainResourceDir, tes
     generator.removeFile(`${javaDir}config/apidocs/GatewaySwaggerResourcesProvider.java`);
     generator.removeFile(`${testDir}config/apidocs/GatewaySwaggerResourcesProviderTest.java`);
   }
-  if (generator.isJhipsterVersionLessThan('7.7.1')) {
-    if (generator.databaseType === MONGODB) {
-      generator.removeFile(`${testDir}MongoDbTestContainerExtension.java`);
+  if (generator.isJhipsterVersionLessThan('7.5.1')) {
+    if (generator.reactive && generator.databaseTypeSql) {
+      generator.removeFile(`${javaDir}service/ColumnConverter.java`);
+      generator.removeFile(`${javaDir}service/EntityManager.java`);
+      generator.removeFile(`${testDir}ArchTest.java`);
     }
+  }
+  if (generator.isJhipsterVersionLessThan('7.7.1')) {
     generator.removeFile(`${testDir}TestContainersSpringContextCustomizerFactory.java`);
-    if (generator.databaseType === CASSANDRA) {
-      generator.removeFile(`${testDir}AbstractCassandraTest.java`);
-    }
-    if (generator.messageBroker === KAFKA) {
-      generator.removeFile(`${javaDir}config/KafkaProperties.java`);
+  }
+  if (generator.isJhipsterVersionLessThan('7.8.1')) {
+    if (generator.databaseTypeNeo4j) {
+      generator.removeFile(`${testDir}AbstractNeo4jIT.java`);
     }
   }
+  if (generator.isJhipsterVersionLessThan('7.8.2')) {
+    generator.removeFile(`${constants.DOCKER_DIR}realm-config/jhipster-users-0.json`);
+    generator.removeFile(`${testDir}NoOpMailConfiguration.java`);
+  }
 }
 
 module.exports = {

package/generators/server/esm.mjs

@@ -19,3 +19,4 @@
 
 export { default } from './index.js';
 export { serverFiles as files } from './files.js';
+export * from './needles.cjs';

package/generators/server/files-couchbase.js

@@ -17,9 +17,6 @@
  * limitations under the License.
  */
 const constants = require('../generator-constants');
-const { MONOLITH } = require('../../jdl/jhipster/application-types');
-const { OAUTH2, SESSION } = require('../../jdl/jhipster/authentication-types');
-const { COUCHBASE } = require('../../jdl/jhipster/database-types');
 
 /* Constants use throughout */
 const DOCKER_DIR = constants.DOCKER_DIR;
@@ -28,7 +25,7 @@ const SERVER_MAIN_RES_DIR = constants.SERVER_MAIN_RES_DIR;
 const SERVER_TEST_SRC_DIR = constants.SERVER_TEST_SRC_DIR;
 
 const shouldSkipUserManagement = generator =>
-  generator.skipUserManagement && (generator.applicationType !== MONOLITH || generator.authenticationType !== OAUTH2);
+  generator.skipUserManagement && (!generator.applicationTypeMonolith || !generator.authenticationTypeOauth2);
 
 const couchbaseFiles = {
   docker: [
@@ -48,7 +45,7 @@ const couchbaseFiles = {
       ],
     },
     {
-      condition: generator => !shouldSkipUserManagement(generator) && generator.authenticationType === SESSION && !generator.reactive,
+      condition: generator => !shouldSkipUserManagement(generator) && generator.authenticationTypeSession && !generator.reactive,
       path: SERVER_MAIN_SRC_DIR,
       templates: [
         {
@@ -58,7 +55,7 @@ const couchbaseFiles = {
       ],
     },
     {
-      condition: generator => generator.searchEngine === COUCHBASE,
+      condition: generator => generator.searchEngineCouchbase,
       path: SERVER_MAIN_SRC_DIR,
       templates: [
         {
@@ -68,7 +65,7 @@ const couchbaseFiles = {
       ],
     },
     {
-      condition: generator => generator.searchEngine === COUCHBASE,
+      condition: generator => generator.searchEngineCouchbase,
       path: SERVER_TEST_SRC_DIR,
       templates: [
         {
@@ -85,7 +82,7 @@ const couchbaseFiles = {
       templates: ['config/couchmove/changelog/V0__create_collections.n1ql', 'config/couchmove/changelog/V0.2__create_indexes.n1ql'],
     },
     {
-      condition: generator => !generator.skipUserManagement || generator.authenticationType === OAUTH2,
+      condition: generator => !generator.skipUserManagement || generator.authenticationTypeOauth2,
       path: SERVER_MAIN_RES_DIR,
       templates: [
         'config/couchmove/changelog/V0.1__initial_setup/authority/ROLE_ADMIN.json',
@@ -100,8 +97,12 @@ const couchbaseFiles = {
       path: SERVER_TEST_SRC_DIR,
       templates: [
         {
-          file: 'package/CouchbaseTestContainerExtension.java',
-          renameTo: generator => `${generator.testDir}CouchbaseTestContainerExtension.java`,
+          file: 'package/config/CouchbaseTestContainer.java',
+          renameTo: generator => `${generator.testDir}config/CouchbaseTestContainer.java`,
+        },
+        {
+          file: 'package/config/EmbeddedCouchbase.java',
+          renameTo: generator => `${generator.testDir}config/EmbeddedCouchbase.java`,
         },
       ],
     },

package/generators/server/files-sql.js

@@ -16,7 +16,29 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-const { SERVER_MAIN_SRC_DIR } = require('../generator-constants');
+const { mergeSections, addSectionsCondition } = require('../utils');
+const constants = require('../generator-constants');
+
+const DOCKER_DIR = constants.DOCKER_DIR;
+const SERVER_MAIN_SRC_DIR = constants.SERVER_MAIN_SRC_DIR;
+const SERVER_MAIN_RES_DIR = constants.SERVER_MAIN_RES_DIR;
+const SERVER_TEST_SRC_DIR = constants.SERVER_TEST_SRC_DIR;
+const SERVER_TEST_RES_DIR = constants.SERVER_TEST_RES_DIR;
+
+const dockerFiles = {
+  docker: [
+    {
+      condition: generator => !generator.prodDatabaseTypeOracle,
+      path: DOCKER_DIR,
+      templates: [{ file: generator => `${generator.prodDatabaseType}.yml` }],
+    },
+    {
+      condition: generator => !generator.devDatabaseTypeOracle && !generator.devDatabaseTypeH2Any,
+      path: DOCKER_DIR,
+      templates: [{ file: generator => `${generator.devDatabaseType}.yml` }],
+    },
+  ],
+};
 
 const sqlFiles = {
   reactiveJavaUserManagement: [
@@ -30,23 +52,194 @@ const sqlFiles = {
         },
       ],
     },
+    {
+      condition: generator => generator.reactive && (!generator.skipUserManagement || generator.authenticationTypeOauth2),
+      path: SERVER_MAIN_SRC_DIR,
+      templates: [
+        {
+          file: 'package/repository/rowmapper/UserRowMapper.java',
+          renameTo: generator => `${generator.javaDir}repository/rowmapper/UserRowMapper.java`,
+        },
+      ],
+    },
+  ],
+  reactiveCommon: [
+    {
+      condition: generator => generator.reactive,
+      path: SERVER_MAIN_SRC_DIR,
+      templates: [
+        {
+          file: 'package/repository/rowmapper/ColumnConverter.java',
+          renameTo: generator => `${generator.javaDir}repository/rowmapper/ColumnConverter.java`,
+        },
+        {
+          file: 'package/repository/EntityManager.java',
+          renameTo: generator => `${generator.javaDir}repository/EntityManager.java`,
+        },
+      ],
+    },
+  ],
+  liquibase: [
+    {
+      path: SERVER_MAIN_SRC_DIR,
+      templates: [
+        {
+          file: 'package/config/LiquibaseConfiguration.java',
+          renameTo: generator => `${generator.javaDir}config/LiquibaseConfiguration.java`,
+        },
+      ],
+    },
+  ],
+  hibernate: [
+    {
+      condition: generator => !generator.reactive,
+      path: SERVER_TEST_SRC_DIR,
+      templates: [
+        {
+          file: 'package/config/timezone/HibernateTimeZoneIT.java',
+          renameTo: generator => `${generator.testDir}config/timezone/HibernateTimeZoneIT.java`,
+        },
+        {
+          file: 'package/repository/timezone/DateTimeWrapper.java',
+          renameTo: generator => `${generator.testDir}repository/timezone/DateTimeWrapper.java`,
+        },
+        {
+          file: 'package/repository/timezone/DateTimeWrapperRepository.java',
+          renameTo: generator => `${generator.testDir}repository/timezone/DateTimeWrapperRepository.java`,
+        },
+      ],
+    },
+  ],
+  testContainers: [
+    {
+      path: SERVER_TEST_SRC_DIR,
+      templates: [
+        {
+          file: 'package/config/EmbeddedSQL.java',
+          renameTo: generator => `${generator.testDir}config/EmbeddedSQL.java`,
+        },
+        {
+          file: 'package/config/SqlTestContainer.java',
+          renameTo: generator => `${generator.testDir}config/SqlTestContainer.java`,
+        },
+      ],
+    },
+    {
+      path: SERVER_TEST_RES_DIR,
+      templates: ['config/application-testdev.yml'],
+    },
+    {
+      condition: generator => !generator.reactive,
+      path: SERVER_TEST_RES_DIR,
+      templates: ['config/application-testprod.yml'],
+    },
+  ],
+};
+
+const h2Files = {
+  serverResource: [
+    {
+      path: SERVER_MAIN_RES_DIR,
+      templates: [{ file: 'h2.server.properties', renameTo: () => '.h2.server.properties' }],
+    },
+  ],
+};
+
+const mysqlFiles = {
+  serverTestSources: [
+    {
+      path: SERVER_TEST_SRC_DIR,
+      templates: [
+        {
+          file: 'package/config/MysqlTestContainer.java',
+          renameTo: generator => `${generator.testDir}config/MysqlTestContainer.java`,
+        },
+      ],
+    },
+    {
+      path: SERVER_TEST_RES_DIR,
+      templates: [{ file: 'testcontainers/mysql/my.cnf', method: 'copy', noEjs: true }],
+    },
+    {
+      path: DOCKER_DIR,
+      templates: [{ file: 'config/mysql/my.cnf', method: 'copy', noEjs: true }],
+    },
   ],
 };
 
+const mariadbFiles = {
+  serverTestSources: [
+    {
+      path: SERVER_TEST_SRC_DIR,
+      templates: [
+        {
+          file: 'package/config/MariadbTestContainer.java',
+          renameTo: generator => `${generator.testDir}config/MariadbTestContainer.java`,
+        },
+      ],
+    },
+    {
+      path: SERVER_TEST_RES_DIR,
+      templates: [{ file: 'testcontainers/mariadb/my.cnf', method: 'copy', noEjs: true }],
+    },
+    {
+      path: DOCKER_DIR,
+      templates: [{ file: 'config/mariadb/my.cnf', method: 'copy', noEjs: true }],
+    },
+  ],
+};
+
+const mssqlFiles = {
+  serverTestSources: [
+    {
+      path: SERVER_TEST_SRC_DIR,
+      templates: [
+        {
+          file: 'package/config/MsSqlTestContainer.java',
+          renameTo: generator => `${generator.testDir}config/MsSqlTestContainer.java`,
+        },
+      ],
+    },
+  ],
+};
+
+const postgresFiles = {
+  serverTestSources: [
+    {
+      path: SERVER_TEST_SRC_DIR,
+      templates: [
+        {
+          file: 'package/config/PostgreSqlTestContainer.java',
+          renameTo: generator => `${generator.testDir}config/PostgreSqlTestContainer.java`,
+        },
+      ],
+    },
+  ],
+};
+
+const serverFiles = mergeSections(
+  sqlFiles,
+  dockerFiles,
+  addSectionsCondition(h2Files, context => context.devDatabaseTypeH2Any),
+  addSectionsCondition(mysqlFiles, context => context.devDatabaseTypeMysql || context.prodDatabaseTypeMysql),
+  addSectionsCondition(mariadbFiles, context => context.devDatabaseTypeMariadb || context.prodDatabaseTypeMariadb),
+  addSectionsCondition(mssqlFiles, context => context.devDatabaseTypeMssql || context.prodDatabaseTypeMssql),
+  addSectionsCondition(postgresFiles, context => context.devDatabaseTypePostgres || context.prodDatabaseTypePostgres)
+);
+
 function writeSqlFiles() {
   return {
     async writeSqlFiles() {
       if (!this.databaseTypeSql) return;
 
       await this.writeFiles({
-        sections: sqlFiles,
-        rootTemplatesPath: ['sql/reactive', 'sql'],
+        sections: serverFiles,
+        rootTemplatesPath: ['sql/reactive', 'sql/common'],
       });
     },
   };
 }
 
 module.exports = {
-  sqlFiles,
   writeSqlFiles,
 };