From 0ffbda6d1dfab6e924df4bb145858bed3a93e212 Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Tue, 13 Dec 2022 09:28:06 -0500 Subject: [PATCH] Fix bug in logic with enable sql without profile --- .../config/server/environment/JdbcEnvironmentRepository.java | 2 +- .../server/environment/JdbcEnvironmentRepositoryTests.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JdbcEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JdbcEnvironmentRepository.java index 97cae6ca..845f89b0 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JdbcEnvironmentRepository.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JdbcEnvironmentRepository.java @@ -129,7 +129,7 @@ public class JdbcEnvironmentRepository implements EnvironmentRepository, Ordered try { Map source; String name; - if (enableSqlWithoutProfie && profile != null) { + if (!enableSqlWithoutProfie || (enableSqlWithoutProfie && profile != null)) { source = this.jdbc.query(this.sql, this.extractor, application, profile, label); name = application + "-" + profile; } diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JdbcEnvironmentRepositoryTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JdbcEnvironmentRepositoryTests.java index 24442a7f..9b74da20 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JdbcEnvironmentRepositoryTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JdbcEnvironmentRepositoryTests.java @@ -187,6 +187,7 @@ public class JdbcEnvironmentRepositoryTests { @Test public void testFailOnError() { JdbcEnvironmentProperties properties = new JdbcEnvironmentProperties(); + properties.setEnableSqlWithoutProfile(true); properties.setSqlWithoutProfile( "SELECT SHOULD_FAIL from TABLE_NOTEXIST where APPLICATION=? and PROFILE is null and LABEL=?"); JdbcEnvironmentRepository repository = new JdbcEnvironmentRepository(new JdbcTemplate(this.dataSource),