From df72dceba473a87614af7e996358751c7cb9dba4 Mon Sep 17 00:00:00 2001 From: WilliamL-RG Date: Tue, 24 Sep 2024 13:33:55 +0100 Subject: [PATCH 1/2] update poms --- flyway-community-db-support-archetype/pom.xml | 2 +- flyway-database-clickhouse/pom.xml | 2 +- flyway-database-databricks/pom.xml | 2 +- flyway-database-db2zos/pom.xml | 2 +- flyway-database-ignite/pom.xml | 3 ++- flyway-database-oceanbase/pom.xml | 2 +- flyway-database-tidb/pom.xml | 2 +- flyway-database-yugabytedb/pom.xml | 2 +- pom.xml | 6 +++--- 9 files changed, 12 insertions(+), 11 deletions(-) diff --git a/flyway-community-db-support-archetype/pom.xml b/flyway-community-db-support-archetype/pom.xml index fa4feec..c010b45 100644 --- a/flyway-community-db-support-archetype/pom.xml +++ b/flyway-community-db-support-archetype/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.flywaydb flyway-community-db-support-archetype - 10.16.1 + 10.16.2 maven-archetype Archetype - flyway-community-db-support-archetype diff --git a/flyway-database-clickhouse/pom.xml b/flyway-database-clickhouse/pom.xml index e94b2b5..fcd2897 100644 --- a/flyway-database-clickhouse/pom.xml +++ b/flyway-database-clickhouse/pom.xml @@ -23,7 +23,7 @@ org.flywaydb flyway-community-db-support - 10.16.1 + 10.16.2 flyway-database-clickhouse diff --git a/flyway-database-databricks/pom.xml b/flyway-database-databricks/pom.xml index 4f34998..3114b38 100644 --- a/flyway-database-databricks/pom.xml +++ b/flyway-database-databricks/pom.xml @@ -23,7 +23,7 @@ org.flywaydb flyway-community-db-support - 10.16.1 + 10.16.2 flyway-database-databricks diff --git a/flyway-database-db2zos/pom.xml b/flyway-database-db2zos/pom.xml index 397cd56..ccb4f29 100644 --- a/flyway-database-db2zos/pom.xml +++ b/flyway-database-db2zos/pom.xml @@ -23,7 +23,7 @@ org.flywaydb flyway-community-db-support - 10.16.1 + 10.16.2 flyway-database-db2zos diff --git a/flyway-database-ignite/pom.xml b/flyway-database-ignite/pom.xml index 33b780b..a0aa650 100644 --- a/flyway-database-ignite/pom.xml +++ b/flyway-database-ignite/pom.xml @@ -23,7 +23,7 @@ org.flywaydb flyway-community-db-support - 10.16.1 + 10.16.2 flyway-database-ignite @@ -33,6 +33,7 @@ ${project.groupId} flyway-core + 10.17.0 org.apache.ignite diff --git a/flyway-database-oceanbase/pom.xml b/flyway-database-oceanbase/pom.xml index e85d451..3c49330 100644 --- a/flyway-database-oceanbase/pom.xml +++ b/flyway-database-oceanbase/pom.xml @@ -23,7 +23,7 @@ org.flywaydb flyway-community-db-support - 10.16.1 + 10.16.2 flyway-database-oceanbase diff --git a/flyway-database-tidb/pom.xml b/flyway-database-tidb/pom.xml index 0cd12f9..df32200 100644 --- a/flyway-database-tidb/pom.xml +++ b/flyway-database-tidb/pom.xml @@ -23,7 +23,7 @@ org.flywaydb flyway-community-db-support - 10.16.1 + 10.16.2 flyway-database-tidb diff --git a/flyway-database-yugabytedb/pom.xml b/flyway-database-yugabytedb/pom.xml index 12354b2..000cdff 100644 --- a/flyway-database-yugabytedb/pom.xml +++ b/flyway-database-yugabytedb/pom.xml @@ -23,7 +23,7 @@ org.flywaydb flyway-community-db-support - 10.16.1 + 10.16.2 flyway-database-yugabytedb diff --git a/pom.xml b/pom.xml index 23a9e7a..5397e54 100644 --- a/pom.xml +++ b/pom.xml @@ -21,14 +21,14 @@ org.flywaydb flyway-parent - 10.17.0 + 10.18.1 4.0.0 flyway-community-db-support pom - 10.16.1 + 10.16.2 ${project.artifactId} @@ -43,7 +43,7 @@ - 10.17.0 + 10.18.1 From cd480070ddda75c8a7e127669835f221f8bd14f5 Mon Sep 17 00:00:00 2001 From: WilliamL-RG Date: Tue, 24 Sep 2024 13:35:40 +0100 Subject: [PATCH 2/2] change createStatement signature --- .../java/org/flywaydb/community/database/db2z/DB2ZParser.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flyway-database-db2zos/src/main/java/org/flywaydb/community/database/db2z/DB2ZParser.java b/flyway-database-db2zos/src/main/java/org/flywaydb/community/database/db2z/DB2ZParser.java index 4eb8210..35959d5 100644 --- a/flyway-database-db2zos/src/main/java/org/flywaydb/community/database/db2z/DB2ZParser.java +++ b/flyway-database-db2zos/src/main/java/org/flywaydb/community/database/db2z/DB2ZParser.java @@ -77,7 +77,7 @@ protected ParsedSqlStatement createStatement(PeekingReader reader, Recorder reco int statementPos, int statementLine, int statementCol, int nonCommentPartPos, int nonCommentPartLine, int nonCommentPartCol, StatementType statementType, boolean canExecuteInTransaction, - Delimiter delimiter, String sql, boolean batchable) throws IOException { + Delimiter delimiter, String sql, List tokens, boolean batchable) throws IOException { LOG.debug(sql); if (statementType == DB2Z_CALL_STATEMENT) { Matcher callMatcher = DB2Z_CALL_WITH_PARMS_REGEX.matcher(sql); @@ -108,7 +108,7 @@ protected ParsedSqlStatement createStatement(PeekingReader reader, Recorder reco LOG.debug("createStatement: DB2Z CALL no parms " + statementType + " " + sql); return super.createStatement(reader, recorder, statementPos, statementLine, statementCol, nonCommentPartPos, nonCommentPartLine, nonCommentPartCol, - statementType, canExecuteInTransaction, delimiter, sql, batchable + statementType, canExecuteInTransaction, delimiter, sql, tokens, batchable ); }