Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ALTER TABLE member
DROP
COLUMN notification_enabled;
10 changes: 5 additions & 5 deletions src/main/resources/mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ spring.config.activate.on-profile: local

spring:
flyway:
enabled: false
enabled: true
baseline-on-migrate: true
locations: classpath:db/migration
locations: classpath:db/migration/dev
jpa:
database: MySQL
open-in-view: false
generate-ddl: false
hibernate:
ddl-auto: update
ddl-auto: none
show-sql: true
properties:
hibernate:
Expand All @@ -56,14 +56,14 @@ spring:
open-in-view: false
generate-ddl: false
hibernate:
ddl-auto: update
ddl-auto: validate
show-sql: true
properties:
hibernate:
dialect: org.hibernate.dialect.MySQLDialect

flyway:
enabled: false
enabled: true
baseline-on-migrate: true
locations: classpath:db/migration/dev

Expand Down
3 changes: 2 additions & 1 deletion src/test/java/clap/server/TaskflowApplicationTests.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,17 @@
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.DynamicPropertyRegistry;
import org.springframework.test.context.DynamicPropertySource;
import org.springframework.test.context.TestPropertySource;
import org.testcontainers.elasticsearch.ElasticsearchContainer;
import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
import org.testcontainers.utility.DockerImageName;

import static org.assertj.core.api.Assertions.assertThat;

//@DataElasticsearchTest
@Testcontainers
@SpringBootTest
@TestPropertySource(properties = "spring.flyway.enabled=false")
class TaskflowApplicationTests {

@Autowired
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import org.springframework.test.annotation.Rollback;
import org.springframework.test.context.DynamicPropertyRegistry;
import org.springframework.test.context.DynamicPropertySource;
import org.springframework.test.context.TestPropertySource;
import org.testcontainers.elasticsearch.ElasticsearchContainer;
import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
Expand All @@ -21,6 +22,7 @@
@SpringBootTest
@Testcontainers
@Transactional
@TestPropertySource(properties = "spring.flyway.enabled=false")
class AddCategoryServiceTest {

@Container
Expand Down
4 changes: 3 additions & 1 deletion src/test/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@ spring:
# Database 설정 정보 (H2 연동 정보)
datasource:
driver-class-name: org.h2.Driver # H2 Database 사용
url: jdbc:h2:mem:testdb # H2 접속 정보
url: jdbc:h2:mem:testdb;DATABASE_TO_UPPER=false # H2 접속 정보
username: taskflow # H2 접속 시 입력할 username 정보
password: # H2 접속 시 입력할 password 정보
jpa:
hibernate:
ddl-auto: create
flyway:
enabled: false

mail:
host: smtp.gmail.com
Expand Down