Skip to content

Fix Liquibase diff when JPA entities not modified #82

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

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Fix Liquibase diff when JPA entities not modified #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dfd30ac
Fix `NoSuchMethodError` on Spring/Hibernate strategy
Tristan-WorkGH Oct 16, 2023
fe0c08d
Merge remote-tracking branch 'origin/main' into fix/liquibase
Tristan-WorkGH Oct 16, 2023
8b8d44f
fix changes
Tristan-WorkGH Oct 16, 2023
b9d42b6
Tmp LOOP DIFF CHANGELOG
Tristan-WorkGH Oct 18, 2023
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
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@ target/
# IntelliJ
/.idea
*.iml

# https://github.com/liquibase/liquibase/issues/2196
/derby.log
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<parent>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-parent-ws</artifactId>
<version>17</version>
<version>18</version>
<relativePath/>
</parent>

Expand Down
16 changes: 16 additions & 0 deletions src/main/resources/db/changelog/changesets/changelog_20231016T075748Z.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
xmlns:pro="http://www.liquibase.org/xml/ns/pro"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/pro http://www.liquibase.org/xml/ns/pro/liquibase-pro-latest.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
<changeSet author="chuinetri (generated)" id="1697443084669-2">
<addUniqueConstraint columnNames="numeric_filter_id_id" constraintName="UC_FORM_CONTINGENCY_LISTNUMERIC_FILTER_ID_ID_COL" tableName="form_contingency_list"/>
</changeSet>
<changeSet author="chuinetri (generated)" id="1697443084669-3">
<addUniqueConstraint columnNames="numeric_filter_id1_id" constraintName="UC_FORM_CONTINGENCY_LISTNUMERIC_FILTER_ID1_ID_COL" tableName="form_contingency_list"/>
</changeSet>
<changeSet author="chuinetri (generated)" id="1697443084669-4">
<addUniqueConstraint columnNames="numeric_filter_id2_id" constraintName="UC_FORM_CONTINGENCY_LISTNUMERIC_FILTER_ID2_ID_COL" tableName="form_contingency_list"/>
</changeSet>
</databaseChangeLog>
15 changes: 15 additions & 0 deletions src/main/resources/db/changelog/changesets/changelog_20231016T152546Z.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:pro="http://www.liquibase.org/xml/ns/pro" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/pro http://www.liquibase.org/xml/ns/pro/liquibase-pro-latest.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
<changeSet author="chuinetri (generated)" id="1697469962255-1">
<dropUniqueConstraint constraintName="UC_FORM_CONTINGENCY_LISTNUMERIC_FILTER_ID1_ID_COL" tableName="form_contingency_list"/>
</changeSet>
<changeSet author="chuinetri (generated)" id="1697469962255-2">
<addUniqueConstraint columnNames="numeric_filter_id1_id" constraintName="UC_FORM_CONTINGENCY_LISTNUMERIC_FILTER_ID1_ID_COL" tableName="form_contingency_list"/>
</changeSet>
<changeSet author="chuinetri (generated)" id="1697469962255-3">
<dropUniqueConstraint constraintName="UC_FORM_CONTINGENCY_LISTNUMERIC_FILTER_ID2_ID_COL" tableName="form_contingency_list"/>
</changeSet>
<changeSet author="chuinetri (generated)" id="1697469962255-4">
<addUniqueConstraint columnNames="numeric_filter_id2_id" constraintName="UC_FORM_CONTINGENCY_LISTNUMERIC_FILTER_ID2_ID_COL" tableName="form_contingency_list"/>
</changeSet>
</databaseChangeLog>
14 changes: 6 additions & 8 deletions src/main/resources/db/changelog/db.changelog-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,31 @@
databaseChangeLog:

- include:
file: changesets/changelog_20211019T140751Z.xml
relativeToChangelogFile: true

- include:
file: changesets/changelog_20211028T094008Z.xml
relativeToChangelogFile: true

- include:
file: changesets/changelog_20211123T105713Z.xml
relativeToChangelogFile: true

- include:
file: changesets/changelog_20220706T093841Z.xml
relativeToChangelogFile: true

- include:
file: changesets/changelog_20221013T153228Z.xml
relativeToChangelogFile: true

- include:
file: changesets/changelog_20221123T132520Z.xml
relativeToChangelogFile: true

- include:
file: changesets/changelog_20230313T145947Z.xml
relativeToChangelogFile: true

- include:
file: changesets/changelog_20230706T144551Z.xml
relativeToChangelogFile: true
- include:
file: changesets/changelog_20231016T075748Z.xml
relativeToChangelogFile: true
- include:
file: changesets/changelog_20231016T152546Z.xml
relativeToChangelogFile: true
4 changes: 2 additions & 2 deletions src/test/resources/application-default.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ spring:
dialect: org.hibernate.dialect.H2Dialect
hibernate.format_sql: true
hibernate:
#to turn off schema validation that fails (because of clob types) and blocks tests even if the the schema is compatible
#to turn off schema validation that fails (because of clob types) and blocks tests even if the schema is compatible
ddl-auto: none

logging:
Expand All @@ -18,5 +18,5 @@ logging:
powsybl-ws:
database:
vendor: h2:mem
query: ;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE;MODE=PostgreSQL
query: ;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE;MODE=PostgreSQL;DEFAULT_NULL_ORDERING=HIGH
hostPort: ":"