Skip to content

fix: resolve PostgreSQL configuration mismatches (Issue #55) #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dfcoffin merged 1 commit into from
Jan 2, 2026
Merged

fix: resolve PostgreSQL configuration mismatches (Issue #55) #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
--health-retries=3

postgres:
image: postgres:15
image: postgres:18
env:
POSTGRES_PASSWORD: postgres
POSTGRES_DB: test_db
Expand Down
8 changes: 5 additions & 3 deletions ...a/org/greenbuttonalliance/espi/common/migration/DataCustodianApplicationPostgresTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.DynamicPropertyRegistry;
import org.springframework.test.context.DynamicPropertySource;
import org.testcontainers.postgresql.PostgreSQLContainer;
import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
import org.testcontainers.postgresql.PostgreSQLContainer;

import java.sql.Connection;
import java.sql.ResultSet;
Expand All @@ -52,8 +52,10 @@
@Disabled("Temporarily disabled due to Issue #53: PostgreSQL UUID CHAR(36) type mismatch. " +
"JPA entities use @GeneratedValue(strategy = GenerationType.UUID) expecting native UUID type, " +
"but Flyway migrations use CHAR(36) for MySQL/H2 compatibility. " +
"This will be resolved after MULTI_PHASE schema compliance plan completes. " +
"See: https://github.com/GreenButtonAlliance/OpenESPI-GreenButton-Java/issues/53")
"Configuration issues (Issue #55) have been resolved - Flyway paths and PostgreSQL version are correct. " +
"This test will be re-enabled after MULTI_PHASE schema compliance plan completes and UUID conversion is implemented. " +
"See: https://github.com/GreenButtonAlliance/OpenESPI-GreenButton-Java/issues/53 " +
"and https://github.com/GreenButtonAlliance/OpenESPI-GreenButton-Java/issues/55")
class DataCustodianApplicationPostgresTest {

@Container
Expand Down
2 changes: 1 addition & 1 deletion openespi-datacustodian/src/test/resources/application-testcontainers-postgresql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spring:
flyway:
enabled: true
baseline-on-migrate: true
locations: classpath:db/migration/postgresql
locations: classpath:db/migration,classpath:db/vendor/postgres

# Faster testing configuration
main:
Expand Down
2 changes: 1 addition & 1 deletion openespi-thirdparty/src/test/resources/application-testcontainers-postgresql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spring:
flyway:
enabled: true
baseline-on-migrate: true
locations: classpath:db/migration/postgresql
locations: classpath:db/migration,classpath:db/vendor/postgres

# Faster testing configuration
main:
Expand Down
Loading