Skip to content

Commit bec0ed3

Browse files
Merge branch 'master' into simplified-mssql
2 parents 6583e78 + fb7ca8f commit bec0ed3

File tree

7 files changed

+27
-15
lines changed

7 files changed

+27
-15
lines changed

.github/workflows/create-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ jobs:
105105
parse-json-secrets: true
106106

107107
- name: Download liquibase-artifacts
108-
uses: dawidd6/action-download-artifact@v11
108+
uses: dawidd6/action-download-artifact@v12
109109
with:
110110
workflow: run-tests.yml
111111
run_id: ${{ needs.setup.outputs.runId }}

.github/workflows/installer-build-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ jobs:
100100
run: echo "BRANCH=${GITHUB_REF#refs/heads/}" >> $GITHUB_ENV
101101

102102
- name: Download liquibase-artifacts
103-
uses: dawidd6/action-download-artifact@v11
103+
uses: dawidd6/action-download-artifact@v12
104104
with:
105105
workflow: run-tests.yml
106106
workflow_conclusion: success

.github/workflows/release-deploy-xsd.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
fi
8484
8585
- name: Liquibase xsds SFTP upload
86-
uses: wangyucode/sftp-upload-action@v2.0.4
86+
uses: wangyucode/sftp-upload-action@v3.0.0
8787
with:
8888
host: ${{ env.WPENGINE_SFTP_HOST }}
8989
port: ${{ env.WPENGINE_SFTP_PORT }}
@@ -95,7 +95,7 @@ jobs:
9595
remoteDir: "/xml/ns/dbchangelog/"
9696

9797
- name: Liquibase index.htm SFTP upload
98-
uses: wangyucode/sftp-upload-action@v2.0.4
98+
uses: wangyucode/sftp-upload-action@v3.0.0
9999
with:
100100
host: ${{ env.WPENGINE_SFTP_HOST }}
101101
port: ${{ env.WPENGINE_SFTP_PORT }}

.github/workflows/release-published.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ jobs:
413413
fi
414414
415415
- name: Liquibase xsds SFTP upload
416-
uses: wangyucode/sftp-upload-action@v2.0.4
416+
uses: wangyucode/sftp-upload-action@v3.0.0
417417
with:
418418
host: ${{ env.WPENGINE_SFTP_HOST }}
419419
port: ${{ env.WPENGINE_SFTP_PORT }}
@@ -425,7 +425,7 @@ jobs:
425425
remoteDir: "/xml/ns/dbchangelog/"
426426

427427
- name: Liquibase index.htm SFTP upload
428-
uses: wangyucode/sftp-upload-action@v2.0.4
428+
uses: wangyucode/sftp-upload-action@v3.0.0
429429
with:
430430
host: ${{ env.WPENGINE_SFTP_HOST }}
431431
port: ${{ env.WPENGINE_SFTP_PORT }}

liquibase-extension-testing/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
<dependency>
105105
<groupId>org.springframework</groupId>
106106
<artifactId>spring-test</artifactId>
107-
<version>5.3.39</version>
107+
<version>${spring.version}</version>
108108
<scope>compile</scope>
109109
</dependency>
110110

liquibase-standard/src/main/java/liquibase/changelog/StandardChangeLogHistoryService.java

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -249,14 +249,8 @@ public void init() throws DatabaseException {
249249
}
250250
}
251251

252-
SqlStatement databaseChangeLogStatement = new SelectFromDatabaseChangeLogStatement(
253-
new SelectFromDatabaseChangeLogStatement.ByCheckSumNotNullAndNotLike(ChecksumVersion.latest().getVersion()),
254-
new ColumnConfig().setName("MD5SUM"));
255-
List<Map<String, ?>> md5sumRS = ChangelogJdbcMdcListener.query(getDatabase(), ex -> ex.queryForList(databaseChangeLogStatement));
256-
257252
//check if any checksum is not using the current version
258-
databaseChecksumsCompatible = md5sumRS.isEmpty();
259-
253+
databaseChecksumsCompatible = getIncompatibleDatabaseChangeLogs().isEmpty();
260254

261255
} else if (!changeLogCreateAttempted) {
262256
executor.comment("Create Database Change Log Table");
@@ -516,6 +510,24 @@ protected String getContextsSize() {
516510
return CONTEXTS_SIZE;
517511
}
518512

513+
/**
514+
* Retrieves changelog entries with checksums that are not compatible with the latest checksum version.
515+
* This method can be overridden by database-specific implementations to provide custom queries for databases that
516+
* don't support standard SQL constructs (e.g., Cassandra CQL).
517+
*
518+
* @return a list of maps containing MD5SUM values for incompatible changelog entries
519+
* @throws DatabaseException if there is an error querying the database
520+
*/
521+
public List<Map<String, ?>> getIncompatibleDatabaseChangeLogs() throws DatabaseException {
522+
SqlStatement databaseChangeLogStatement = new SelectFromDatabaseChangeLogStatement(
523+
new SelectFromDatabaseChangeLogStatement.ByCheckSumNotNullAndNotLike(
524+
ChecksumVersion.latest().getVersion()
525+
),
526+
new ColumnConfig().setName("MD5SUM")
527+
);
528+
return ChangelogJdbcMdcListener.query(getDatabase(), ex -> ex.queryForList(databaseChangeLogStatement));
529+
}
530+
519531
@Override
520532
public boolean isDatabaseChecksumsCompatible() {
521533
return this.databaseChecksumsCompatible;

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
<junit-jupiter.version>6.0.1</junit-jupiter.version>
7777
<groovy.version>5.0.3</groovy.version>
7878
<spock.version>2.4-groovy-5.0</spock.version>
79-
<spring.version>5.3.39</spring.version>
79+
<spring.version>7.0.2</spring.version>
8080
<maven-failsafe-plugin.version>3.5.4</maven-failsafe-plugin.version>
8181
<jacoco-maven-plugin.version>0.8.14</jacoco-maven-plugin.version>
8282
<maven-surefire-plugin.version>3.5.4</maven-surefire-plugin.version>

0 commit comments

Comments
 (0)