[#11061] [#11070] [#11091] RAND

jOOQ · Dec 14, 2020 · 7f90a92 · 7f90a92
1 parent a59fe42
commit 7f90a92
Show file tree

Hide file tree

Showing 57 changed files with 716 additions and 37 deletions.
diff --git a/jOOQ/src/main/java/org/jooq/impl/Abs.java b/jOOQ/src/main/java/org/jooq/impl/Abs.java
@@ -48,6 +48,7 @@
 
 import org.jooq.*;
 import org.jooq.impl.*;
+import org.jooq.tools.*;
 
 import java.util.*;
 
@@ -85,4 +86,19 @@ public final void accept(Context<?> ctx) {
     }
 
 
+
+    // -------------------------------------------------------------------------
+    // The Object API
+    // -------------------------------------------------------------------------
+
+    @Override
+    public boolean equals(Object that) {
+        if (that instanceof Abs) {
+            return
+                StringUtils.equals(number, ((Abs) that).number)
+            ;
+        }
+        else
+            return super.equals(that);
+    }
 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractParam.java b/jOOQ/src/main/java/org/jooq/impl/AbstractParam.java
@@ -197,17 +197,17 @@ public boolean equals(Object that) {
         if (this == that)
             return true;
 
-        if (that instanceof AbstractParam) {
-            AbstractParam<?> thatParam = (AbstractParam<?>) that;
+        if (that instanceof Param) {
+            Object thatValue = ((Param<?>) that).getValue();
 
             if (value == null)
-                return thatParam.value == null;
-            else if (value instanceof byte[] && thatParam.value instanceof byte[])
-                return Arrays.equals((byte[]) value, (byte[]) thatParam.value);
-            else if (value instanceof Object[] && thatParam.value instanceof Object[])
-                return Arrays.equals((Object[]) value, (Object[]) thatParam.value);
+                return thatValue == null;
+            else if (value instanceof byte[] && thatValue instanceof byte[])
+                return Arrays.equals((byte[]) value, (byte[]) thatValue);
+            else if (value instanceof Object[] && thatValue instanceof Object[])
+                return Arrays.equals((Object[]) value, (Object[]) thatValue);
             else
-                return value.equals(thatParam.value);
+                return value.equals(thatValue);
         }
         else
             return false;

diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterDatabaseImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterDatabaseImpl.java
@@ -48,6 +48,7 @@
 
 import org.jooq.*;
 import org.jooq.impl.*;
+import org.jooq.tools.*;
 
 import java.util.*;
 

diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterDomainImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterDomainImpl.java
@@ -48,6 +48,7 @@
 
 import org.jooq.*;
 import org.jooq.impl.*;
+import org.jooq.tools.*;
 
 import java.util.*;
 

diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterSchemaImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterSchemaImpl.java
@@ -48,6 +48,7 @@
 
 import org.jooq.*;
 import org.jooq.impl.*;
+import org.jooq.tools.*;
 
 import java.util.*;
 

diff --git a/jOOQ/src/main/java/org/jooq/impl/Ascii.java b/jOOQ/src/main/java/org/jooq/impl/Ascii.java
@@ -48,6 +48,7 @@
 
 import org.jooq.*;
 import org.jooq.impl.*;
+import org.jooq.tools.*;
 
 import java.util.*;
 
@@ -105,4 +106,19 @@ public final void accept(Context<?> ctx) {
     }
 
 
+
+    // -------------------------------------------------------------------------
+    // The Object API
+    // -------------------------------------------------------------------------
+
+    @Override
+    public boolean equals(Object that) {
+        if (that instanceof Ascii) {
+            return
+                StringUtils.equals(string, ((Ascii) that).string)
+            ;
+        }
+        else
+            return super.equals(that);
+    }
 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/BitLength.java b/jOOQ/src/main/java/org/jooq/impl/BitLength.java
@@ -48,6 +48,7 @@
 
 import org.jooq.*;
 import org.jooq.impl.*;
+import org.jooq.tools.*;
 
 import java.util.*;
 
@@ -116,4 +117,19 @@ public void accept(Context<?> ctx) {
     }
 
 
+
+    // -------------------------------------------------------------------------
+    // The Object API
+    // -------------------------------------------------------------------------
+
+    @Override
+    public boolean equals(Object that) {
+        if (that instanceof BitLength) {
+            return
+                StringUtils.equals(string, ((BitLength) that).string)
+            ;
+        }
+        else
+            return super.equals(that);
+    }
 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/CharLength.java b/jOOQ/src/main/java/org/jooq/impl/CharLength.java
@@ -48,6 +48,7 @@
 
 import org.jooq.*;
 import org.jooq.impl.*;
+import org.jooq.tools.*;
 
 import java.util.*;
 
@@ -108,4 +109,19 @@ public void accept(Context<?> ctx) {
     }
 
 
+
+    // -------------------------------------------------------------------------
+    // The Object API
+    // -------------------------------------------------------------------------
+
+    @Override
+    public boolean equals(Object that) {
+        if (that instanceof CharLength) {
+            return
+                StringUtils.equals(string, ((CharLength) that).string)
+            ;
+        }
+        else
+            return super.equals(that);
+    }
 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/ConvertedVal.java b/jOOQ/src/main/java/org/jooq/impl/ConvertedVal.java
@@ -118,4 +118,23 @@ public final ParamType getParamType() {
     public final ParamMode getParamMode() {
         return delegate.getParamMode();
     }
+
+    // -------------------------------------------------------------------------
+    // The Object API
+    // -------------------------------------------------------------------------
+
+    @Override
+    public String toString() {
+        return delegate.toString();
+    }
+
+    @Override
+    public int hashCode() {
+        return delegate.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+        return delegate.equals(that);
+    }
 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/Cos.java b/jOOQ/src/main/java/org/jooq/impl/Cos.java
@@ -48,6 +48,7 @@
 
 import org.jooq.*;
 import org.jooq.impl.*;
+import org.jooq.tools.*;
 
 import java.util.*;
 import java.math.BigDecimal;
@@ -86,4 +87,19 @@ public final void accept(Context<?> ctx) {
     }
 
 
+
+    // -------------------------------------------------------------------------
+    // The Object API
+    // -------------------------------------------------------------------------
+
+    @Override
+    public boolean equals(Object that) {
+        if (that instanceof Cos) {
+            return
+                StringUtils.equals(number, ((Cos) that).number)
+            ;
+        }
+        else
+            return super.equals(that);
+    }
 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/Cosh.java b/jOOQ/src/main/java/org/jooq/impl/Cosh.java
@@ -48,6 +48,7 @@
 
 import org.jooq.*;
 import org.jooq.impl.*;
+import org.jooq.tools.*;
 
 import java.util.*;
 import java.math.BigDecimal;
@@ -118,4 +119,19 @@ public final void accept(Context<?> ctx) {
     }
 
 
+
+    // -------------------------------------------------------------------------
+    // The Object API
+    // -------------------------------------------------------------------------
+
+    @Override
+    public boolean equals(Object that) {
+        if (that instanceof Cosh) {
+            return
+                StringUtils.equals(number, ((Cosh) that).number)
+            ;
+        }
+        else
+            return super.equals(that);
+    }
 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/Cot.java b/jOOQ/src/main/java/org/jooq/impl/Cot.java
@@ -48,6 +48,7 @@
 
 import org.jooq.*;
 import org.jooq.impl.*;
+import org.jooq.tools.*;
 
 import java.util.*;
 import java.math.BigDecimal;
@@ -100,4 +101,19 @@ public final void accept(Context<?> ctx) {
     }
 
 
+
+    // -------------------------------------------------------------------------
+    // The Object API
+    // -------------------------------------------------------------------------
+
+    @Override
+    public boolean equals(Object that) {
+        if (that instanceof Cot) {
+            return
+                StringUtils.equals(number, ((Cot) that).number)
+            ;
+        }
+        else
+            return super.equals(that);
+    }
 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/Coth.java b/jOOQ/src/main/java/org/jooq/impl/Coth.java
@@ -48,6 +48,7 @@
 
 import org.jooq.*;
 import org.jooq.impl.*;
+import org.jooq.tools.*;
 
 import java.util.*;
 import java.math.BigDecimal;
@@ -89,4 +90,19 @@ public final void accept(Context<?> ctx) {
     }
 
 
+
+    // -------------------------------------------------------------------------
+    // The Object API
+    // -------------------------------------------------------------------------
+
+    @Override
+    public boolean equals(Object that) {
+        if (that instanceof Coth) {
+            return
+                StringUtils.equals(number, ((Coth) that).number)
+            ;
+        }
+        else
+            return super.equals(that);
+    }
 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateDatabaseImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateDatabaseImpl.java
@@ -48,6 +48,7 @@
 
 import org.jooq.*;
 import org.jooq.impl.*;
+import org.jooq.tools.*;
 
 import java.util.*;
 

diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java
@@ -48,6 +48,7 @@
 
 import org.jooq.*;
 import org.jooq.impl.*;
+import org.jooq.tools.*;
 
 import java.util.*;
 

diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateSchemaImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateSchemaImpl.java
@@ -48,6 +48,7 @@
 
 import org.jooq.*;
 import org.jooq.impl.*;
+import org.jooq.tools.*;
 
 import java.util.*;
 

diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java
@@ -48,6 +48,7 @@
 
 import org.jooq.*;
 import org.jooq.impl.*;
+import org.jooq.tools.*;
 
 import java.util.*;
 

diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java
@@ -15732,6 +15732,17 @@ public static Field<BigDecimal> rad(Field<? extends Number> degrees) {
         return new Radians(degrees);
     }
 
+    /**
+     * The <code>RAND</code> function.
+     * <p>
+     * Turn a value in degrees to radians.
+     */
+    @NotNull
+    @Support
+    public static Field<BigDecimal> rand() {
+        return new Rand();
+    }
+
     /**
      * The <code>REPEAT</code> function.
      * <p>
@@ -19990,15 +20001,6 @@ public static <T extends Number> Field<T> shr(Field<T> field1, Field<? extends N
     // XXX Mathematical functions
     // ------------------------------------------------------------------------
 
-    /**
-     * Get the rand() function.
-     */
-    @NotNull
-    @Support
-    public static Field<BigDecimal> rand() {
-        return new Rand();
-    }
-
     /**
      * Find the greatest among all values.
      * <p>

diff --git a/jOOQ/src/main/java/org/jooq/impl/Degrees.java b/jOOQ/src/main/java/org/jooq/impl/Degrees.java
@@ -48,6 +48,7 @@
 
 import org.jooq.*;
 import org.jooq.impl.*;
+import org.jooq.tools.*;
 
 import java.util.*;
 import java.math.BigDecimal;
@@ -104,4 +105,19 @@ public final void accept(Context<?> ctx) {
     }
 
 
+
+    // -------------------------------------------------------------------------
+    // The Object API
+    // -------------------------------------------------------------------------
+
+    @Override
+    public boolean equals(Object that) {
+        if (that instanceof Degrees) {
+            return
+                StringUtils.equals(radians, ((Degrees) that).radians)
+            ;
+        }
+        else
+            return super.equals(that);
+    }
 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropDatabaseImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropDatabaseImpl.java
@@ -48,6 +48,7 @@
 
 import org.jooq.*;
 import org.jooq.impl.*;
+import org.jooq.tools.*;
 
 import java.util.*;