Skip to content

Commit 5c27f89

Browse files
authored
Change includeLabelInSql to default to true (#3431)
To disable this use ebean.includeLabelInSql=false or set this via `DatabaseBuilder.includeLabelInSql(false)``
1 parent bfbbb7e commit 5c27f89

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public class DatabaseConfig implements DatabaseBuilder.Settings {
129129
* When true then include a sql comment in generated SELECT queries with the query
130130
* label or profile location label.
131131
*/
132-
private boolean includeLabelInSql;
132+
private boolean includeLabelInSql = true;
133133

134134
/**
135135
* Interesting classes such as entities, embedded, ScalarTypes,

ebean-api/src/test/java/io/ebean/config/DatabaseConfigTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ void testLoadWithProperties() {
7676
props.setProperty("skipDataSourceCheck", "true");
7777
props.setProperty("readOnlyDatabase", "true");
7878
props.setProperty("lengthCheck", "ON");
79-
props.setProperty("includeLabelInSql", "true");
79+
props.setProperty("includeLabelInSql", "false");
8080

8181
props.setProperty("queryPlan.enable", "true");
8282
props.setProperty("queryPlan.thresholdMicros", "10000");
@@ -97,7 +97,7 @@ void testLoadWithProperties() {
9797
assertTrue(settings.isLoadModuleInfo());
9898
assertTrue(settings.skipDataSourceCheck());
9999
assertTrue(settings.readOnlyDatabase());
100-
assertTrue(settings.isIncludeLabelInSql());
100+
assertFalse(settings.isIncludeLabelInSql());
101101
assertThat(settings.getLengthCheck()).isEqualTo(LengthCheck.ON);
102102

103103
assertTrue(settings.isIdGeneratorAutomatic());
@@ -183,7 +183,7 @@ void test_defaults() {
183183
assertEquals(10000L, config.getQueryPlanCaptureMaxTimeMillis());
184184
assertEquals(10, config.getQueryPlanCaptureMaxCount());
185185
assertThat(config.getLengthCheck()).isEqualTo(LengthCheck.OFF);
186-
assertFalse(config.isIncludeLabelInSql());
186+
assertTrue(config.isIncludeLabelInSql());
187187

188188
config.setLoadModuleInfo(false);
189189
assertFalse(config.isAutoLoadModuleInfo());

0 commit comments

Comments
 (0)