Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
2577c671
Commit
2577c671
authored
Oct 13, 2020
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix mapping of outputQueryResults property
Closes gh-23645
parent
98914b65
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
3 deletions
+17
-3
FlywayAutoConfiguration.java
...rk/boot/autoconfigure/flyway/FlywayAutoConfiguration.java
+3
-0
FlywayProperties.java
...framework/boot/autoconfigure/flyway/FlywayProperties.java
+3
-3
FlywayAutoConfigurationTests.java
...ot/autoconfigure/flyway/FlywayAutoConfigurationTests.java
+11
-0
No files found.
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java
View file @
2577c671
...
@@ -233,6 +233,9 @@ public class FlywayAutoConfiguration {
...
@@ -233,6 +233,9 @@ public class FlywayAutoConfiguration {
map
.
from
(
properties
.
getOracleKerberosConfigFile
()).
whenNonNull
()
map
.
from
(
properties
.
getOracleKerberosConfigFile
()).
whenNonNull
()
.
to
((
configFile
)
->
configuration
.
orackeKerberosConfigFile
(
configFile
));
.
to
((
configFile
)
->
configuration
.
orackeKerberosConfigFile
(
configFile
));
// No method reference for compatibility with Flyway 6.x
// No method reference for compatibility with Flyway 6.x
map
.
from
(
properties
.
getOutputQueryResults
()).
whenNonNull
()
.
to
((
outputQueryResults
)
->
configuration
.
outputQueryResults
(
outputQueryResults
));
// No method reference for compatibility with Flyway 6.x
map
.
from
(
properties
.
getSkipExecutingMigrations
()).
whenNonNull
()
map
.
from
(
properties
.
getSkipExecutingMigrations
()).
whenNonNull
()
.
to
((
skipExecutingMigrations
)
->
configuration
.
skipExecutingMigrations
(
skipExecutingMigrations
));
.
to
((
skipExecutingMigrations
)
->
configuration
.
skipExecutingMigrations
(
skipExecutingMigrations
));
}
}
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java
View file @
2577c671
...
@@ -315,7 +315,7 @@ public class FlywayProperties {
...
@@ -315,7 +315,7 @@ public class FlywayProperties {
* Whether Flyway should output a table with the results of queries when executing
* Whether Flyway should output a table with the results of queries when executing
* migrations. Requires Flyway Teams.
* migrations. Requires Flyway Teams.
*/
*/
private
boolean
outputQueryResults
=
true
;
private
Boolean
outputQueryResults
;
/**
/**
* Whether Flyway should skip executing the contents of the migrations and only update
* Whether Flyway should skip executing the contents of the migrations and only update
...
@@ -743,11 +743,11 @@ public class FlywayProperties {
...
@@ -743,11 +743,11 @@ public class FlywayProperties {
this
.
oracleKerberosConfigFile
=
oracleKerberosConfigFile
;
this
.
oracleKerberosConfigFile
=
oracleKerberosConfigFile
;
}
}
public
boolean
is
OutputQueryResults
()
{
public
Boolean
get
OutputQueryResults
()
{
return
this
.
outputQueryResults
;
return
this
.
outputQueryResults
;
}
}
public
void
setOutputQueryResults
(
b
oolean
outputQueryResults
)
{
public
void
setOutputQueryResults
(
B
oolean
outputQueryResults
)
{
this
.
outputQueryResults
=
outputQueryResults
;
this
.
outputQueryResults
=
outputQueryResults
;
}
}
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java
View file @
2577c671
...
@@ -563,6 +563,17 @@ class FlywayAutoConfigurationTests {
...
@@ -563,6 +563,17 @@ class FlywayAutoConfigurationTests {
});
});
}
}
@Test
void
outputQueryResultsIsCorrectlyMapped
()
{
this
.
contextRunner
.
withUserConfiguration
(
EmbeddedDataSourceConfiguration
.
class
)
.
withPropertyValues
(
"spring.flyway.output-query-results=false"
).
run
((
context
)
->
{
assertThat
(
context
).
hasFailed
();
Throwable
failure
=
context
.
getStartupFailure
();
assertThat
(
failure
).
hasRootCauseInstanceOf
(
FlywayTeamsUpgradeRequiredException
.
class
);
assertThat
(
failure
).
hasMessageContaining
(
" outputQueryResults "
);
});
}
@Test
@Test
void
skipExecutingMigrationsIsCorrectlyMapped
()
{
void
skipExecutingMigrationsIsCorrectlyMapped
()
{
this
.
contextRunner
.
withUserConfiguration
(
EmbeddedDataSourceConfiguration
.
class
)
this
.
contextRunner
.
withUserConfiguration
(
EmbeddedDataSourceConfiguration
.
class
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment