From 3ac7b1d0b14091a9e312be0cfa87f6df8bb54978 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Wed, 19 Jan 2022 18:11:10 +0100
Subject: [PATCH] [jOOQ/jOOQ#7284] Implement a few new patterns:

- transformPatternsMergeRangePredicates
---
 .../src/main/java/org/jooq/conf/Settings.java | 96 +++++++++++++++++++
 .../java/org/jooq/impl/TransformPatterns.java | 44 +++++++++
 2 files changed, 140 insertions(+)

diff --git a/jOOQ/src/main/java/org/jooq/conf/Settings.java b/jOOQ/src/main/java/org/jooq/conf/Settings.java
index c4d9bacd84..0658aa85f9 100644
--- a/jOOQ/src/main/java/org/jooq/conf/Settings.java
+++ b/jOOQ/src/main/java/org/jooq/conf/Settings.java
@@ -139,6 +139,10 @@ public class Settings
     @XmlElement(defaultValue = "true")
     protected Boolean transformPatternsMergeInLists = true;
     @XmlElement(defaultValue = "true")
+    protected Boolean transformPatternsMergeRangePredicates = true;
+    @XmlElement(defaultValue = "true")
+    protected Boolean transformPatternsMergeBetweenSymmetricPredicates = true;
+    @XmlElement(defaultValue = "true")
     protected Boolean transformPatternsTrivialPredicates = true;
     @XmlElement(defaultValue = "true")
     protected Boolean transformPatternsEmptyScalarSubquery = true;
@@ -1522,6 +1526,66 @@ public class Settings
         this.transformPatternsMergeInLists = value;
     }
 
+    /**
+     * Transform <code>x >= a AND x <= b</code> to <code>x BETWEEN a AND b</code>.
+     * <p>
+     * This transformation merges multiple <code>AND</code> connected range predicates to a single comparison using <code>BETWEEN</code>.
+     * <p>
+     * To enable this feature, {@link #transformPatterns} must be enabled as well.
+     * <p>
+     * This feature is available in the commercial distribution only.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Boolean }
+     *     
+     */
+    public Boolean isTransformPatternsMergeRangePredicates() {
+        return transformPatternsMergeRangePredicates;
+    }
+
+    /**
+     * Sets the value of the transformPatternsMergeRangePredicates property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Boolean }
+     *     
+     */
+    public void setTransformPatternsMergeRangePredicates(Boolean value) {
+        this.transformPatternsMergeRangePredicates = value;
+    }
+
+    /**
+     * Transform <code>x BETWEEN a AND b OR x BETWEEN b AND a</code> to <code>x BETWEEN SYMMETRIC a AND b</code>.
+     * <p>
+     * This transformation merges multiple <code>OR</code> connected <code>BETWEEN</code> predicates to a single comparison using <code>BETWEEN SYMMETRIC</code>.
+     * <p>
+     * To enable this feature, {@link #transformPatterns} must be enabled as well.
+     * <p>
+     * This feature is available in the commercial distribution only.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Boolean }
+     *     
+     */
+    public Boolean isTransformPatternsMergeBetweenSymmetricPredicates() {
+        return transformPatternsMergeBetweenSymmetricPredicates;
+    }
+
+    /**
+     * Sets the value of the transformPatternsMergeBetweenSymmetricPredicates property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Boolean }
+     *     
+     */
+    public void setTransformPatternsMergeBetweenSymmetricPredicates(Boolean value) {
+        this.transformPatternsMergeBetweenSymmetricPredicates = value;
+    }
+
     /**
      * Transform trivial predicates like <code>1 = 1</code> to <code>TRUE</code>.
      * <p>
@@ -3983,6 +4047,16 @@ public class Settings
         return this;
     }
 
+    public Settings withTransformPatternsMergeRangePredicates(Boolean value) {
+        setTransformPatternsMergeRangePredicates(value);
+        return this;
+    }
+
+    public Settings withTransformPatternsMergeBetweenSymmetricPredicates(Boolean value) {
+        setTransformPatternsMergeBetweenSymmetricPredicates(value);
+        return this;
+    }
+
     public Settings withTransformPatternsTrivialPredicates(Boolean value) {
         setTransformPatternsTrivialPredicates(value);
         return this;
@@ -4844,6 +4918,8 @@ public class Settings
         builder.append("transformPatternsAndNeToNotIn", transformPatternsAndNeToNotIn);
         builder.append("transformPatternsMergeOrComparison", transformPatternsMergeOrComparison);
         builder.append("transformPatternsMergeInLists", transformPatternsMergeInLists);
+        builder.append("transformPatternsMergeRangePredicates", transformPatternsMergeRangePredicates);
+        builder.append("transformPatternsMergeBetweenSymmetricPredicates", transformPatternsMergeBetweenSymmetricPredicates);
         builder.append("transformPatternsTrivialPredicates", transformPatternsTrivialPredicates);
         builder.append("transformPatternsEmptyScalarSubquery", transformPatternsEmptyScalarSubquery);
         builder.append("transformPatternsNegNeg", transformPatternsNegNeg);
@@ -5361,6 +5437,24 @@ public class Settings
                 return false;
             }
         }
+        if (transformPatternsMergeRangePredicates == null) {
+            if (other.transformPatternsMergeRangePredicates!= null) {
+                return false;
+            }
+        } else {
+            if (!transformPatternsMergeRangePredicates.equals(other.transformPatternsMergeRangePredicates)) {
+                return false;
+            }
+        }
+        if (transformPatternsMergeBetweenSymmetricPredicates == null) {
+            if (other.transformPatternsMergeBetweenSymmetricPredicates!= null) {
+                return false;
+            }
+        } else {
+            if (!transformPatternsMergeBetweenSymmetricPredicates.equals(other.transformPatternsMergeBetweenSymmetricPredicates)) {
+                return false;
+            }
+        }
         if (transformPatternsTrivialPredicates == null) {
             if (other.transformPatternsTrivialPredicates!= null) {
                 return false;
@@ -6312,6 +6406,8 @@ public class Settings
         result = ((prime*result)+((transformPatternsAndNeToNotIn == null)? 0 :transformPatternsAndNeToNotIn.hashCode()));
         result = ((prime*result)+((transformPatternsMergeOrComparison == null)? 0 :transformPatternsMergeOrComparison.hashCode()));
         result = ((prime*result)+((transformPatternsMergeInLists == null)? 0 :transformPatternsMergeInLists.hashCode()));
+        result = ((prime*result)+((transformPatternsMergeRangePredicates == null)? 0 :transformPatternsMergeRangePredicates.hashCode()));
+        result = ((prime*result)+((transformPatternsMergeBetweenSymmetricPredicates == null)? 0 :transformPatternsMergeBetweenSymmetricPredicates.hashCode()));
         result = ((prime*result)+((transformPatternsTrivialPredicates == null)? 0 :transformPatternsTrivialPredicates.hashCode()));
         result = ((prime*result)+((transformPatternsEmptyScalarSubquery == null)? 0 :transformPatternsEmptyScalarSubquery.hashCode()));
         result = ((prime*result)+((transformPatternsNegNeg == null)? 0 :transformPatternsNegNeg.hashCode()));
diff --git a/jOOQ/src/main/java/org/jooq/impl/TransformPatterns.java b/jOOQ/src/main/java/org/jooq/impl/TransformPatterns.java
index bbd13d2315..fdddc265c4 100644
--- a/jOOQ/src/main/java/org/jooq/impl/TransformPatterns.java
+++ b/jOOQ/src/main/java/org/jooq/impl/TransformPatterns.java
@@ -803,6 +803,50 @@ package org.jooq.impl;
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+