Skip to content

Commit

Permalink
Bump version to flyway-10.17.3
Browse files Browse the repository at this point in the history 
Please see the GH release for the release notes

fix skipExecutingMigrations with OSS edition

bug: Add NOLOCK to SQL Server query to reduce blocking
  • Loading branch information
@rg-buildmonkey
rg-buildmonkey committed Sep 2, 2024
1 parent 68538a6 commit c995105
Show file tree
Hide file tree
Showing 40 changed files with 81 additions and 54 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ flyway-rulesengine-sqlfluff/sqlfluff*

flyway-rgcompare/**/resources/rgcompare/
flyway-rgcompare/**/resources/obj/
flyway-rgcompare/rgcompare/
flyway-comparison-engines/**/resources/flyway-comparison/
flyway-comparison-engines/**/resources/obj/
flyway-comparison-engines/flyway-comparison/
Expand Down
2 changes: 1 addition & 1 deletion documentation/Flyway CLI and API/Concepts/Migrations.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Optionally their effect can be undone by supplying an **undo migration** with th
(re-)applied every time their checksum changes.

Within a single migration run, repeatable migrations are always applied last, after all pending versioned migrations
have been executed. Repeatable migrations are applied in the order of their description.
have been executed. Repeatable migrations are applied in the alphanumeric order of their description.

By default both versioned and repeatable migrations can be written either in **[SQL](Concepts/migrations#sql-based-migrations)**
or in **[Java](Concepts/migrations#java-based-migrations)** and can consist of multiple statements.
Expand Down
19 changes: 18 additions & 1 deletion documentation/Release notes and older versions/Release Notes for Flyway Engine.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,24 @@
</div>
<div class="col-md-9">

<div class="release">
<h2 id="10.17.3">Flyway 10.17.3 (2024-09-02)</h2>

<h3>Bug fixes</h3>
<ul>
<li>Add NOLOCK to SQL Server query to reduce blocking</li>
<li>Fix result publishing when chaining commands</li>
<li>
<a href="https://github.com/flyway/flyway/issues/3947">Issue 3947</a>
skipExecutingMigrations now works for OSS
</li>
</ul>

<p>
Thanks to catostrophe for reporting these issues.
</p>
</div>

<div class="release">
<h2 id="10.17.2">Flyway 10.17.2 (2024-08-22)</h2>

Expand Down Expand Up @@ -581,7 +599,6 @@ <h3>New features</h3>
<h3>Java compatibility</h3>
<ul>
<li>Move `flyway-sqlserver` into `flyway-database` folder space</li>
<li>Update JRE included in Flyway Command Line to Java 21</li>
</ul>

<p>
Expand Down
2 changes: 1 addition & 1 deletion documentation/_config.yml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
flywayVersion: 10.17.2
flywayVersion: 10.17.3
enterpriseUrl: https://download.red-gate.com/maven/release/com/redgate/flyway
kramdown:
smart_quotes: ["apos", "apos", "quot", "quot"]
Expand Down
8 changes: 7 additions & 1 deletion flyway-commandline/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-parent</artifactId>
<version>10.17.2</version>
<version>10.17.3</version>
</parent>
<artifactId>flyway-commandline</artifactId>
<packaging>jar</packaging>
Expand Down Expand Up @@ -341,6 +341,12 @@












Expand Down
1 change: 1 addition & 0 deletions flyway-commandline/src/main/assembly/component.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,7 @@






<include>org.flywaydb:flyway-database-ignite</include>
Expand Down
2 changes: 1 addition & 1 deletion flyway-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-parent</artifactId>
<version>10.17.2</version>
<version>10.17.3</version>
</parent>
<artifactId>flyway-core</artifactId>
<packaging>jar</packaging>
Expand Down
27 changes: 16 additions & 11 deletions flyway-core/src/main/java/org/flywaydb/core/extensibility/PluginMetadata.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,12 @@ default String getHelpText() {

int padSize = 0;
if (configurationParameters != null) {
padSize = configurationParameters.stream().mapToInt(p -> p.name.length()).max().orElse(0) + 2;
padSize = configurationParameters.stream().map(p -> p.name + (p.required ? " [REQUIRED]" : "")).mapToInt(
String::length).max().orElse(0) + 2;
}
if (flags != null) {
padSize = Math.max(padSize, flags.stream().mapToInt(p -> p.name.length()).max().orElse(0) + 2);
padSize = Math.max(padSize, flags.stream().map(p -> p.name + (p.required ? " [REQUIRED]" : "")).mapToInt(
String::length).max().orElse(0) + 2);
}

if (configurationParameters != null) {
Expand All @@ -61,23 +63,26 @@ default String getHelpText() {
final String parameterName = p.name.startsWith("flyway.")
? p.name.substring("flyway.".length())
: p.name;
result.append(indent).append(StringUtils.rightPad(parameterName, padSize, ' ')).append(p.description);
if (p.required) {
result.append(" [REQUIRED]");
final String fullParameter = parameterName + (p.required ? " [REQUIRED]" : "");
result.append(indent).append(StringUtils.rightPad(fullParameter, padSize, ' '));

final String descriptionPadding = " ".repeat(indent.length() + padSize);
final List<String> descriptionLines = Arrays.stream(p.description.split("\n")).toList();

result.append(descriptionLines.get(0)).append("\n");
for (int i = 1; i < descriptionLines.size(); i++) {
result.append(descriptionPadding).append(descriptionLines.get(i)).append("\n");
}
result.append("\n");
}
result.append("\n");
}

if (flags != null) {
result.append("Flags:\n");
for (ConfigurationParameter p : flags) {
result.append(indent).append(StringUtils.rightPad(p.name, padSize, ' ')).append(p.description);
if (p.required) {
result.append(" [REQUIRED]");
}
result.append("\n");
final String flagName = p.name + (p.required ? " [REQUIRED]" : "");
result.append(indent).append(StringUtils.rightPad(flagName, padSize, ' ')).append(p.description).append(
"\n");
}
result.append("\n");
}
Expand Down
6 changes: 1 addition & 5 deletions flyway-core/src/main/java/org/flywaydb/core/internal/command/DbMigrate.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -248,11 +248,7 @@ private Integer migrateGroup(boolean firstRun) {
}

if (!group.isEmpty()) {
boolean skipExecutingMigrations = false;



applyMigrations(group, skipExecutingMigrations);
applyMigrations(group, configuration.isSkipExecutingMigrations());
}
return group.size();
}
Expand Down
2 changes: 1 addition & 1 deletion flyway-database/flyway-database-cassandra/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-parent</artifactId>
<version>10.17.2</version>
<version>10.17.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flyway-database/flyway-database-db2/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-parent</artifactId>
<version>10.17.2</version>
<version>10.17.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flyway-database/flyway-database-derby/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-parent</artifactId>
<version>10.17.2</version>
<version>10.17.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flyway-database/flyway-database-hsqldb/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-parent</artifactId>
<version>10.17.2</version>
<version>10.17.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flyway-database/flyway-database-informix/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-parent</artifactId>
<version>10.17.2</version>
<version>10.17.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flyway-database/flyway-database-mongodb/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-parent</artifactId>
<version>10.17.2</version>
<version>10.17.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flyway-database/flyway-database-oracle/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-parent</artifactId>
<version>10.17.2</version>
<version>10.17.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flyway-database/flyway-database-postgresql/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-parent</artifactId>
<version>10.17.2</version>
<version>10.17.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flyway-database/flyway-database-redshift/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<groupId>org.flywaydb</groupId>
<artifactId>flyway-parent</artifactId>
<relativePath>../../pom.xml</relativePath>
<version>10.17.2</version>
<version>10.17.3</version>
</parent>

<artifactId>flyway-database-redshift</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion flyway-database/flyway-database-saphana/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-parent</artifactId>
<version>10.17.2</version>
<version>10.17.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flyway-database/flyway-database-snowflake/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-parent</artifactId>
<version>10.17.2</version>
<version>10.17.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flyway-database/flyway-database-sybasease/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-parent</artifactId>
<version>10.17.2</version>
<version>10.17.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flyway-database/flyway-firebird/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>flyway-parent</artifactId>
<groupId>org.flywaydb</groupId>
<version>10.17.2</version>
<version>10.17.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion flyway-database/flyway-gcp-bigquery/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-parent</artifactId>
<version>10.17.2</version>
<version>10.17.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion flyway-database/flyway-gcp-spanner/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-parent</artifactId>
<version>10.17.2</version>
<version>10.17.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion flyway-database/flyway-mysql/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>flyway-parent</artifactId>
<groupId>org.flywaydb</groupId>
<version>10.17.2</version>
<version>10.17.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion flyway-database/flyway-singlestore/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-parent</artifactId>
<version>10.17.2</version>
<version>10.17.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion flyway-database/flyway-sqlserver/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-parent</artifactId>
<version>10.17.2</version>
<version>10.17.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
4 changes: 2 additions & 2 deletions ...abase/flyway-sqlserver/src/main/java/org/flywaydb/database/sqlserver/SQLServerSchema.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -305,8 +305,8 @@ protected List<DBObject> queryDBObjects(ObjectType... types) throws SQLException
* @throws SQLException when the retrieval failed.
*/
private List<DBObject> queryDBObjectsWithParent(DBObject parent, ObjectType... types) throws SQLException {
StringBuilder query = new StringBuilder("SELECT obj.object_id, obj.name FROM sys.objects AS obj " +
"LEFT JOIN sys.extended_properties AS eps " +
StringBuilder query = new StringBuilder("SELECT obj.object_id, obj.name FROM sys.objects AS obj WITH (NOLOCK)" +
"LEFT JOIN sys.extended_properties AS eps WITH (NOLOCK)" +
"ON obj.object_id = eps.major_id " +
"AND eps.class = 1 " + // Class 1 = objects and columns (we are only interested in objects).
"AND eps.minor_id = 0 " + // Minor ID, always 0 for objects.
Expand Down
2 changes: 1 addition & 1 deletion flyway-database/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-parent</artifactId>
<version>10.17.2</version>
<version>10.17.3</version>
</parent>

<artifactId>flyway-database</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion flyway-experimental/flyway-experimental-mongodb/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-parent</artifactId>
<version>10.17.2</version>
<version>10.17.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flyway-experimental/flyway-experimental-scanners/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-parent</artifactId>
<version>10.17.2</version>
<version>10.17.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flyway-experimental/flyway-experimental-sqlite/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-parent</artifactId>
<version>10.17.2</version>
<version>10.17.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flyway-experimental/flyway-verb-info/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-parent</artifactId>
<version>10.17.2</version>
<version>10.17.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flyway-experimental/flyway-verb-utils/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-parent</artifactId>
<version>10.17.2</version>
<version>10.17.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flyway-experimental/flyway-verb-validate/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-parent</artifactId>
<version>10.17.2</version>
<version>10.17.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
Loading

0 comments on commit c995105

Please sign in to comment.