Fixed db profiles

Author: oleksandrh

docker-compose.yml

@@ -17,6 +17,24 @@ services:
       timeout: 5s
       retries: 5
 
+  mysql:
+    image: mysql:8.0
+    container_name: petclinic-mysql
+    ports:
+      - "3306:3306"
+    environment:
+      MYSQL_ROOT_PASSWORD: root
+      MYSQL_DATABASE: patient_records
+      MYSQL_USER: patient_user
+      MYSQL_PASSWORD: patient_pass
+    volumes:
+      - mysql_data:/var/lib/mysql
+    healthcheck:
+      test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+
   app:
     build: ./
     environment:
@@ -72,3 +90,4 @@ services:
 
 volumes:
   postgres_data:
+  mysql_data:

src/main/java/org/springframework/samples/petclinic/clinicactivity/ClinicActivityController.java

@@ -10,6 +10,7 @@
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Profile;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.jdbc.core.JdbcTemplate;
@@ -22,6 +23,7 @@
 
 @RestController
 @RequestMapping("/api/clinic-activity")
+@Profile("postgres")
 public class ClinicActivityController implements InitializingBean {
 
     private static final Logger logger = LoggerFactory.getLogger(ClinicActivityController.class);

src/main/java/org/springframework/samples/petclinic/clinicactivity/ClinicActivityDataService.java

@@ -5,6 +5,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Profile;
 import org.springframework.samples.petclinic.model.ClinicActivityLog;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.PlatformTransactionManager;
@@ -35,6 +36,7 @@
 import java.util.HashMap;
 
 @Service
+@Profile("postgres")
 public class ClinicActivityDataService {
 
     private static final Logger logger = LoggerFactory.getLogger(ClinicActivityDataService.class);

src/main/java/org/springframework/samples/petclinic/config/DatabaseConfig.java

@@ -7,16 +7,19 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
+import org.springframework.context.annotation.Profile;
 import org.springframework.jdbc.core.JdbcTemplate;
 
 import javax.sql.DataSource;
 
 @Configuration
+@Profile({"postgres", "mysql"})
 public class DatabaseConfig {
 
     @Primary
     @Bean(name = "postgresDataSource")
     @ConfigurationProperties("app.datasource.postgres")
+    @Profile("postgres")
     public DataSource postgresDataSource() {
         return DataSourceBuilder.create().type(HikariDataSource.class).build();
     }
@@ -29,6 +32,7 @@ public DataSource mysqlDataSource() {
 
     @Primary
     @Bean(name = "postgresJdbcTemplate")
+    @Profile("postgres")
     public JdbcTemplate postgresJdbcTemplate(@Qualifier("postgresDataSource") DataSource dataSource) {
         return new JdbcTemplate(dataSource);
     }

src/main/java/org/springframework/samples/petclinic/config/MySqlConfig.java

@@ -4,6 +4,7 @@
 import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.orm.jpa.JpaTransactionManager;
 import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
@@ -22,6 +23,7 @@
     transactionManagerRef = "mysqlTransactionManager",
     basePackages = {"org.springframework.samples.petclinic.patientrecords"}
 )
+@Profile({"postgres", "mysql"})
 public class MySqlConfig {
 
     @Bean(name = "mysqlEntityManagerFactory")

src/main/java/org/springframework/samples/petclinic/config/PostgresConfig.java

@@ -5,6 +5,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
+import org.springframework.context.annotation.Profile;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.orm.jpa.JpaTransactionManager;
 import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
@@ -27,6 +28,7 @@
         "org.springframework.samples.petclinic.clinicactivity"
     }
 )
+@Profile("postgres")
 public class PostgresConfig {
 
     @Primary

src/main/java/org/springframework/samples/petclinic/patientrecords/PatientRecordController.java

@@ -10,6 +10,7 @@
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Profile;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.jdbc.core.JdbcTemplate;
@@ -21,6 +22,7 @@
 
 @RestController
 @RequestMapping("/api/patient-records")
+@Profile({"postgres", "mysql"})
 public class PatientRecordController implements InitializingBean {
 
     private static final Logger logger = LoggerFactory.getLogger(PatientRecordController.class);

src/main/java/org/springframework/samples/petclinic/patientrecords/PatientRecordDataService.java

@@ -5,6 +5,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Profile;
 import org.springframework.samples.petclinic.model.PatientRecord;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.PlatformTransactionManager;
@@ -23,6 +24,7 @@
 import java.util.concurrent.TimeUnit;
 
 @Service
+@Profile({"postgres", "mysql"})
 public class PatientRecordDataService {
 
     private static final Logger logger = LoggerFactory.getLogger(PatientRecordDataService.class);

src/main/java/org/springframework/samples/petclinic/patientrecords/PatientRecordUiController.java

@@ -2,6 +2,7 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Profile;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -10,6 +11,7 @@
 
 @Controller
 @RequestMapping("/patient-records")
+@Profile({"postgres", "mysql"})
 public class PatientRecordUiController {
 
     private final JdbcTemplate mysqlJdbcTemplate;

src/main/resources/application-mysql.properties

@@ -1,7 +1,48 @@
-# database init, supports mysql too
-database=mysql
-spring.datasource.url=${MYSQL_URL:jdbc:mysql://localhost/petclinic}
-spring.datasource.username=${MYSQL_USER:petclinic}
-spring.datasource.password=${MYSQL_PASS:petclinic}
-# SQL is written to be idempotent so this is safe
+database=h2
+
+# MySQL Configuration for Patient Records ONLY
+# This profile enables MySQL ONLY for patient records
+# Main petclinic data (owners, pets, visits, vets) uses H2 database
+
+# Primary DataSource - H2 (Main PetClinic Data)
+# H2 handles all petclinic functionality when using MySQL profile
+# spring.datasource settings are inherited from default application.properties
+
+# Secondary DataSource - MySQL (Patient Records ONLY)
+app.datasource.mysql.jdbc-url=${MYSQL_URL:jdbc:mysql://localhost:3306/patient_records}
+app.datasource.mysql.username=${MYSQL_USER:patient_user}
+app.datasource.mysql.password=${MYSQL_PASS:patient_pass}
+app.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+
+# Connection Pool Settings for MySQL (Patient Records)
+app.datasource.mysql.maximum-pool-size=10
+app.datasource.mysql.minimum-idle=2
+app.datasource.mysql.connection-timeout=20000
+app.datasource.mysql.idle-timeout=300000
+app.datasource.mysql.max-lifetime=1200000
+
+# Schema and Data Initialization - H2 ONLY (Main PetClinic)
 spring.sql.init.mode=always
+spring.sql.init.continue-on-error=false
+spring.sql.init.separator=;
+
+# MySQL Patient Records - NO AUTO INITIALIZATION
+# Patient records schema must be manually created when needed
+app.patient.records.auto-init=false
+app.patient.records.enabled=${PATIENT_RECORDS_ENABLED:true}
+
+# JPA/Hibernate Settings - H2 (Main PetClinic Data)
+spring.jpa.hibernate.ddl-auto=none
+spring.jpa.show-sql=false
+spring.jpa.properties.hibernate.format_sql=false
+spring.jpa.properties.hibernate.jdbc.batch_size=25
+spring.jpa.properties.hibernate.order_inserts=true
+spring.jpa.properties.hibernate.order_updates=true
+spring.jpa.properties.hibernate.jdbc.batch_versioned_data=true
+
+# Application Architecture Settings
+app.database.primary=h2
+app.database.secondary=mysql
+app.database.mode=separated
+app.database.primary.purpose=petclinic_data
+app.database.secondary.purpose=patient_records_only