Skip to content
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

rename the init.h2.sql to avoid loading wrong files in quick start mode #5034

Merged
merged 1 commit into from
Dec 6, 2023
Merged

rename the init.h2.sql to avoid loading wrong files in quick start mode #5034

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 apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/BizDBPropertySource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
@PostConstruct
public void runSqlScript() throws Exception {
if (env.acceptsProfiles(Profiles.of("h2"))) {
Resource resource = new ClassPathResource("jpa/init.h2.sql");
Resource resource = new ClassPathResource("jpa/configdb.init.h2.sql");

Check warning on line 70 in apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/BizDBPropertySource.java

View check run for this annotation

Codecov / codecov/patch

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/BizDBPropertySource.java#L70 

Added line #L70 was not covered by tests
if (resource.exists()) {
DatabasePopulatorUtils.execute(new ResourceDatabasePopulator(resource), dataSource);
}
Expand Down
0 ...ervice/src/main/resources/jpa/init.h2.sql → ...c/main/resources/jpa/configdb.init.h2.sql
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ortal/src/main/java/com/ctrip/framework/apollo/portal/service/PortalDBPropertySource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
@PostConstruct
public void runSqlScript() throws Exception {
if (env.acceptsProfiles(Profiles.of("h2"))) {
Resource resource = new ClassPathResource("jpa/init.h2.sql");
Resource resource = new ClassPathResource("jpa/portaldb.init.h2.sql");

Check warning on line 66 in apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/PortalDBPropertySource.java

View check run for this annotation

Codecov / codecov/patch

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/PortalDBPropertySource.java#L66 

Added line #L66 was not covered by tests
if (resource.exists()) {
DatabasePopulatorUtils.execute(new ResourceDatabasePopulator(resource), dataSource);
}
Expand Down
0 ...portal/src/main/resources/jpa/init.h2.sql → ...c/main/resources/jpa/portaldb.init.h2.sql
View file
Open in desktop
File renamed without changes.
Loading