From c144fa97b2744b3e0cc45e8dd3bc5e9c1a473851 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Wed, 2 Nov 2022 11:21:56 +0100 Subject: [PATCH] [jOOQ/jOOQ#13593] Remove transformPatternsCaseThenBoolean flag. It's just a special case of transformPatternsSimplifyCaseAbbreviation. No need for a dedicated flag. --- .../src/main/java/org/jooq/conf/Settings.java | 46 ------------------- .../src/main/java/org/jooq/impl/Patterns.java | 19 -------- .../org/jooq/xsd/jooq-runtime-3.18.0.xsd | 8 ---- 3 files changed, 73 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/conf/Settings.java b/jOOQ/src/main/java/org/jooq/conf/Settings.java index 0efb7305d2..2fe5d1dab9 100644 --- a/jOOQ/src/main/java/org/jooq/conf/Settings.java +++ b/jOOQ/src/main/java/org/jooq/conf/Settings.java @@ -187,8 +187,6 @@ public class Settings @XmlElement(defaultValue = "true") protected Boolean transformPatternsCaseMergeWhenElse = true; @XmlElement(defaultValue = "true") - protected Boolean transformPatternsCaseThenBoolean = true; - @XmlElement(defaultValue = "true") protected Boolean transformPatternsCaseToCaseAbbreviation = true; @XmlElement(defaultValue = "true") protected Boolean transformPatternsSimplifyCaseAbbreviation = true; @@ -2299,34 +2297,6 @@ public class Settings this.transformPatternsCaseMergeWhenElse = value; } - /** - * Transform CASE … THEN TRUE ELSE FALSE to something simpler. - *

- * A CASE expression that transforms things to booleans can usually be simplified easily. - *

- * This feature is available in the commercial distribution only. - * - * @return - * possible object is - * {@link Boolean } - * - */ - public Boolean isTransformPatternsCaseThenBoolean() { - return transformPatternsCaseThenBoolean; - } - - /** - * Sets the value of the transformPatternsCaseThenBoolean property. - * - * @param value - * allowed object is - * {@link Boolean } - * - */ - public void setTransformPatternsCaseThenBoolean(Boolean value) { - this.transformPatternsCaseThenBoolean = value; - } - /** * Transform CASE expressions to their respective abbreviations. *

@@ -5434,11 +5404,6 @@ public class Settings return this; } - public Settings withTransformPatternsCaseThenBoolean(Boolean value) { - setTransformPatternsCaseThenBoolean(value); - return this; - } - public Settings withTransformPatternsCaseToCaseAbbreviation(Boolean value) { setTransformPatternsCaseToCaseAbbreviation(value); return this; @@ -6433,7 +6398,6 @@ public class Settings builder.append("transformPatternsCaseElseCase", transformPatternsCaseElseCase); builder.append("transformPatternsCaseMergeWhenWhen", transformPatternsCaseMergeWhenWhen); builder.append("transformPatternsCaseMergeWhenElse", transformPatternsCaseMergeWhenElse); - builder.append("transformPatternsCaseThenBoolean", transformPatternsCaseThenBoolean); builder.append("transformPatternsCaseToCaseAbbreviation", transformPatternsCaseToCaseAbbreviation); builder.append("transformPatternsSimplifyCaseAbbreviation", transformPatternsSimplifyCaseAbbreviation); builder.append("transformPatternsTrivialCaseAbbreviation", transformPatternsTrivialCaseAbbreviation); @@ -7185,15 +7149,6 @@ public class Settings return false; } } - if (transformPatternsCaseThenBoolean == null) { - if (other.transformPatternsCaseThenBoolean!= null) { - return false; - } - } else { - if (!transformPatternsCaseThenBoolean.equals(other.transformPatternsCaseThenBoolean)) { - return false; - } - } if (transformPatternsCaseToCaseAbbreviation == null) { if (other.transformPatternsCaseToCaseAbbreviation!= null) { return false; @@ -8331,7 +8286,6 @@ public class Settings result = ((prime*result)+((transformPatternsCaseElseCase == null)? 0 :transformPatternsCaseElseCase.hashCode())); result = ((prime*result)+((transformPatternsCaseMergeWhenWhen == null)? 0 :transformPatternsCaseMergeWhenWhen.hashCode())); result = ((prime*result)+((transformPatternsCaseMergeWhenElse == null)? 0 :transformPatternsCaseMergeWhenElse.hashCode())); - result = ((prime*result)+((transformPatternsCaseThenBoolean == null)? 0 :transformPatternsCaseThenBoolean.hashCode())); result = ((prime*result)+((transformPatternsCaseToCaseAbbreviation == null)? 0 :transformPatternsCaseToCaseAbbreviation.hashCode())); result = ((prime*result)+((transformPatternsSimplifyCaseAbbreviation == null)? 0 :transformPatternsSimplifyCaseAbbreviation.hashCode())); result = ((prime*result)+((transformPatternsTrivialCaseAbbreviation == null)? 0 :transformPatternsTrivialCaseAbbreviation.hashCode())); diff --git a/jOOQ/src/main/java/org/jooq/impl/Patterns.java b/jOOQ/src/main/java/org/jooq/impl/Patterns.java index 96558e7b3b..aa0a19dcfb 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Patterns.java +++ b/jOOQ/src/main/java/org/jooq/impl/Patterns.java @@ -1938,25 +1938,6 @@ package org.jooq.impl; - - - - - - - - - - - - - - - - - - - diff --git a/jOOQ/src/main/resources/org/jooq/xsd/jooq-runtime-3.18.0.xsd b/jOOQ/src/main/resources/org/jooq/xsd/jooq-runtime-3.18.0.xsd index 0ba54198b1..b8165ea76b 100644 --- a/jOOQ/src/main/resources/org/jooq/xsd/jooq-runtime-3.18.0.xsd +++ b/jOOQ/src/main/resources/org/jooq/xsd/jooq-runtime-3.18.0.xsd @@ -604,14 +604,6 @@ be replaced by the ELSE clause content. This feature is available in the commercial distribution only.]]> - - CASE .. THEN TRUE ELSE FALSE to something simpler. -

-A CASE expression that transforms things to booleans can usually be simplified easily. -

-This feature is available in the commercial distribution only.]]> - - CASE expressions to their respective abbreviations.