From 26413079cee7bba8ebfa39b9f38856401f171317 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Fri, 18 Mar 2022 17:06:07 +0100 Subject: [PATCH] [jOOQ/jOOQ#13307] Change () arguments in experimental QOM function types to () --- jOOQ/src/main/java/org/jooq/impl/Abs.java | 18 +- jOOQ/src/main/java/org/jooq/impl/Acos.java | 18 +- jOOQ/src/main/java/org/jooq/impl/Acosh.java | 20 +- jOOQ/src/main/java/org/jooq/impl/Acoth.java | 22 +- jOOQ/src/main/java/org/jooq/impl/Asin.java | 18 +- jOOQ/src/main/java/org/jooq/impl/Asinh.java | 20 +- jOOQ/src/main/java/org/jooq/impl/Atan.java | 18 +- jOOQ/src/main/java/org/jooq/impl/Atanh.java | 20 +- .../src/main/java/org/jooq/impl/BitCount.java | 54 ++--- jOOQ/src/main/java/org/jooq/impl/Chr.java | 22 +- jOOQ/src/main/java/org/jooq/impl/Cos.java | 18 +- jOOQ/src/main/java/org/jooq/impl/Cosh.java | 22 +- jOOQ/src/main/java/org/jooq/impl/Cot.java | 20 +- jOOQ/src/main/java/org/jooq/impl/Coth.java | 22 +- jOOQ/src/main/java/org/jooq/impl/DSL.java | 190 +++++++++--------- .../src/main/java/org/jooq/impl/Patterns.java | 55 +++++ jOOQ/src/main/java/org/jooq/impl/QOM.java | 76 +++---- jOOQ/src/main/java/org/jooq/impl/Sign.java | 24 +-- jOOQ/src/main/java/org/jooq/impl/Sin.java | 18 +- jOOQ/src/main/java/org/jooq/impl/Sinh.java | 22 +- jOOQ/src/main/java/org/jooq/impl/Tan.java | 18 +- jOOQ/src/main/java/org/jooq/impl/Tanh.java | 22 +- 22 files changed, 396 insertions(+), 341 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/Abs.java b/jOOQ/src/main/java/org/jooq/impl/Abs.java index 59caf2e803..6893e10720 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Abs.java +++ b/jOOQ/src/main/java/org/jooq/impl/Abs.java @@ -72,17 +72,17 @@ implements QOM.Abs { - final Field number; + final Field value; Abs( - Field number + Field value ) { super( N_ABS, - allNotNull((DataType) dataType(INTEGER, number, false), number) + allNotNull((DataType) dataType(INTEGER, value, false), value) ); - this.number = nullSafeNotNull(number, INTEGER); + this.value = nullSafeNotNull(value, INTEGER); } // ------------------------------------------------------------------------- @@ -99,7 +99,7 @@ implements default: - ctx.visit(function(N_ABS, getDataType(), number)); + ctx.visit(function(N_ABS, getDataType(), value)); break; } } @@ -120,12 +120,12 @@ implements // ------------------------------------------------------------------------- @Override - public final Field $number() { - return number; + public final Field $value() { + return value; } @Override - public final QOM.Abs $number(Field newValue) { + public final QOM.Abs $value(Field newValue) { return $constructor().apply(newValue); } @@ -162,7 +162,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Abs) { QOM.Abs o = (QOM.Abs) that; return - StringUtils.equals($number(), o.$number()) + StringUtils.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Acos.java b/jOOQ/src/main/java/org/jooq/impl/Acos.java index 71ace62ab9..a17a43564b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Acos.java +++ b/jOOQ/src/main/java/org/jooq/impl/Acos.java @@ -73,17 +73,17 @@ implements QOM.Acos { - final Field number; + final Field value; Acos( - Field number + Field value ) { super( N_ACOS, - allNotNull(NUMERIC, number) + allNotNull(NUMERIC, value) ); - this.number = nullSafeNotNull(number, INTEGER); + this.value = nullSafeNotNull(value, INTEGER); } // ------------------------------------------------------------------------- @@ -115,7 +115,7 @@ implements default: - ctx.visit(function(N_ACOS, getDataType(), number)); + ctx.visit(function(N_ACOS, getDataType(), value)); break; } } @@ -136,12 +136,12 @@ implements // ------------------------------------------------------------------------- @Override - public final Field $number() { - return number; + public final Field $value() { + return value; } @Override - public final QOM.Acos $number(Field newValue) { + public final QOM.Acos $value(Field newValue) { return $constructor().apply(newValue); } @@ -178,7 +178,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Acos) { QOM.Acos o = (QOM.Acos) that; return - StringUtils.equals($number(), o.$number()) + StringUtils.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Acosh.java b/jOOQ/src/main/java/org/jooq/impl/Acosh.java index ac182fbbf8..34c3441341 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Acosh.java +++ b/jOOQ/src/main/java/org/jooq/impl/Acosh.java @@ -73,17 +73,17 @@ implements QOM.Acosh { - final Field number; + final Field value; Acosh( - Field number + Field value ) { super( N_ACOSH, - allNotNull(NUMERIC, number) + allNotNull(NUMERIC, value) ); - this.number = nullSafeNotNull(number, INTEGER); + this.value = nullSafeNotNull(value, INTEGER); } // ------------------------------------------------------------------------- @@ -121,11 +121,11 @@ implements case MARIADB: case MYSQL: case YUGABYTEDB: - ctx.visit(DSL.ln(iadd(number, DSL.sqrt(isub(square(number), one()))))); + ctx.visit(DSL.ln(iadd(value, DSL.sqrt(isub(square(value), one()))))); break; default: - ctx.visit(function(N_ACOSH, getDataType(), number)); + ctx.visit(function(N_ACOSH, getDataType(), value)); break; } } @@ -146,12 +146,12 @@ implements // ------------------------------------------------------------------------- @Override - public final Field $number() { - return number; + public final Field $value() { + return value; } @Override - public final QOM.Acosh $number(Field newValue) { + public final QOM.Acosh $value(Field newValue) { return $constructor().apply(newValue); } @@ -188,7 +188,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Acosh) { QOM.Acosh o = (QOM.Acosh) that; return - StringUtils.equals($number(), o.$number()) + StringUtils.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Acoth.java b/jOOQ/src/main/java/org/jooq/impl/Acoth.java index 09912fd55a..63e4a04e19 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Acoth.java +++ b/jOOQ/src/main/java/org/jooq/impl/Acoth.java @@ -73,17 +73,17 @@ implements QOM.Acoth { - final Field number; + final Field value; Acoth( - Field number + Field value ) { super( N_ACOTH, - allNotNull(NUMERIC, number) + allNotNull(NUMERIC, value) ); - this.number = nullSafeNotNull(number, INTEGER); + this.value = nullSafeNotNull(value, INTEGER); } // ------------------------------------------------------------------------- @@ -128,13 +128,13 @@ implements case MARIADB: case MYSQL: case POSTGRES: - + case SQLITE: case YUGABYTEDB: - ctx.visit(idiv(DSL.ln(idiv(iadd(number, one()), isub(number, one()))), two())); + ctx.visit(idiv(DSL.ln(idiv(iadd(value, one()), isub(value, one()))), two())); break; default: - ctx.visit(function(N_ACOTH, getDataType(), number)); + ctx.visit(function(N_ACOTH, getDataType(), value)); break; } } @@ -155,12 +155,12 @@ implements // ------------------------------------------------------------------------- @Override - public final Field $number() { - return number; + public final Field $value() { + return value; } @Override - public final QOM.Acoth $number(Field newValue) { + public final QOM.Acoth $value(Field newValue) { return $constructor().apply(newValue); } @@ -197,7 +197,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Acoth) { QOM.Acoth o = (QOM.Acoth) that; return - StringUtils.equals($number(), o.$number()) + StringUtils.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Asin.java b/jOOQ/src/main/java/org/jooq/impl/Asin.java index 20771eb2de..6706c0fdec 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Asin.java +++ b/jOOQ/src/main/java/org/jooq/impl/Asin.java @@ -73,17 +73,17 @@ implements QOM.Asin { - final Field number; + final Field value; Asin( - Field number + Field value ) { super( N_ASIN, - allNotNull(NUMERIC, number) + allNotNull(NUMERIC, value) ); - this.number = nullSafeNotNull(number, INTEGER); + this.value = nullSafeNotNull(value, INTEGER); } // ------------------------------------------------------------------------- @@ -111,7 +111,7 @@ implements default: - ctx.visit(function(N_ASIN, getDataType(), number)); + ctx.visit(function(N_ASIN, getDataType(), value)); break; } } @@ -132,12 +132,12 @@ implements // ------------------------------------------------------------------------- @Override - public final Field $number() { - return number; + public final Field $value() { + return value; } @Override - public final QOM.Asin $number(Field newValue) { + public final QOM.Asin $value(Field newValue) { return $constructor().apply(newValue); } @@ -174,7 +174,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Asin) { QOM.Asin o = (QOM.Asin) that; return - StringUtils.equals($number(), o.$number()) + StringUtils.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Asinh.java b/jOOQ/src/main/java/org/jooq/impl/Asinh.java index a49cbe7a46..ade01e5a02 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Asinh.java +++ b/jOOQ/src/main/java/org/jooq/impl/Asinh.java @@ -73,17 +73,17 @@ implements QOM.Asinh { - final Field number; + final Field value; Asinh( - Field number + Field value ) { super( N_ASINH, - allNotNull(NUMERIC, number) + allNotNull(NUMERIC, value) ); - this.number = nullSafeNotNull(number, INTEGER); + this.value = nullSafeNotNull(value, INTEGER); } // ------------------------------------------------------------------------- @@ -121,11 +121,11 @@ implements case MARIADB: case MYSQL: case YUGABYTEDB: - ctx.visit(DSL.ln(iadd(number, DSL.sqrt(iadd(square(number), one()))))); + ctx.visit(DSL.ln(iadd(value, DSL.sqrt(iadd(square(value), one()))))); break; default: - ctx.visit(function(N_ASINH, getDataType(), number)); + ctx.visit(function(N_ASINH, getDataType(), value)); break; } } @@ -146,12 +146,12 @@ implements // ------------------------------------------------------------------------- @Override - public final Field $number() { - return number; + public final Field $value() { + return value; } @Override - public final QOM.Asinh $number(Field newValue) { + public final QOM.Asinh $value(Field newValue) { return $constructor().apply(newValue); } @@ -188,7 +188,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Asinh) { QOM.Asinh o = (QOM.Asinh) that; return - StringUtils.equals($number(), o.$number()) + StringUtils.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Atan.java b/jOOQ/src/main/java/org/jooq/impl/Atan.java index 006c39ff6f..a8774ccc32 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Atan.java +++ b/jOOQ/src/main/java/org/jooq/impl/Atan.java @@ -73,17 +73,17 @@ implements QOM.Atan { - final Field number; + final Field value; Atan( - Field number + Field value ) { super( N_ATAN, - allNotNull(NUMERIC, number) + allNotNull(NUMERIC, value) ); - this.number = nullSafeNotNull(number, INTEGER); + this.value = nullSafeNotNull(value, INTEGER); } // ------------------------------------------------------------------------- @@ -106,7 +106,7 @@ implements default: - ctx.visit(function(N_ATAN, getDataType(), number)); + ctx.visit(function(N_ATAN, getDataType(), value)); break; } } @@ -127,12 +127,12 @@ implements // ------------------------------------------------------------------------- @Override - public final Field $number() { - return number; + public final Field $value() { + return value; } @Override - public final QOM.Atan $number(Field newValue) { + public final QOM.Atan $value(Field newValue) { return $constructor().apply(newValue); } @@ -169,7 +169,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Atan) { QOM.Atan o = (QOM.Atan) that; return - StringUtils.equals($number(), o.$number()) + StringUtils.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Atanh.java b/jOOQ/src/main/java/org/jooq/impl/Atanh.java index fc93c75da5..bfe64ce884 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Atanh.java +++ b/jOOQ/src/main/java/org/jooq/impl/Atanh.java @@ -73,17 +73,17 @@ implements QOM.Atanh { - final Field number; + final Field value; Atanh( - Field number + Field value ) { super( N_ATANH, - allNotNull(NUMERIC, number) + allNotNull(NUMERIC, value) ); - this.number = nullSafeNotNull(number, INTEGER); + this.value = nullSafeNotNull(value, INTEGER); } // ------------------------------------------------------------------------- @@ -120,11 +120,11 @@ implements case MARIADB: case MYSQL: case YUGABYTEDB: - ctx.visit(idiv(DSL.ln(idiv(iadd(one(), number), isub(one(), number))), two())); + ctx.visit(idiv(DSL.ln(idiv(iadd(one(), value), isub(one(), value))), two())); break; default: - ctx.visit(function(N_ATANH, getDataType(), number)); + ctx.visit(function(N_ATANH, getDataType(), value)); break; } } @@ -145,12 +145,12 @@ implements // ------------------------------------------------------------------------- @Override - public final Field $number() { - return number; + public final Field $value() { + return value; } @Override - public final QOM.Atanh $number(Field newValue) { + public final QOM.Atanh $value(Field newValue) { return $constructor().apply(newValue); } @@ -187,7 +187,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Atanh) { QOM.Atanh o = (QOM.Atanh) that; return - StringUtils.equals($number(), o.$number()) + StringUtils.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/BitCount.java b/jOOQ/src/main/java/org/jooq/impl/BitCount.java index 3d9ab929cf..63f68acea0 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BitCount.java +++ b/jOOQ/src/main/java/org/jooq/impl/BitCount.java @@ -72,17 +72,17 @@ implements QOM.BitCount { - final Field number; + final Field value; BitCount( - Field number + Field value ) { super( N_BIT_COUNT, - allNotNull(INTEGER, number) + allNotNull(INTEGER, value) ); - this.number = nullSafeNotNull(number, INTEGER); + this.value = nullSafeNotNull(value, INTEGER); } // ------------------------------------------------------------------------- @@ -104,7 +104,7 @@ implements case MARIADB: case MYSQL: - ctx.visit(N_BIT_COUNT).sql('(').visit(number).sql(')'); + ctx.visit(N_BIT_COUNT).sql('(').visit(value).sql(')'); return; @@ -132,9 +132,9 @@ implements case H2: case HSQLDB: { - if (number.getType() == Byte.class) { + if (value.getType() == Byte.class) { @SuppressWarnings("unchecked") - Field f = (Field) number; + Field f = (Field) value; ctx.visit( DSL.bitAnd(f, inline((byte) 0x01)) .add( @@ -147,9 +147,9 @@ implements DSL.bitAnd(f, inline((byte) 0x80)).div(inline((byte) 0x80))).cast(Integer.class)); return; } - else if (number.getType() == Short.class) { + else if (value.getType() == Short.class) { @SuppressWarnings("unchecked") - Field f = (Field) number; + Field f = (Field) value; ctx.visit( DSL.bitAnd(f, inline((short) 0x0001)) .add( @@ -170,9 +170,9 @@ implements DSL.bitAnd(f, inline((short) 0x8000)).div(inline((short) 0x8000))).cast(Integer.class)); return; } - else if (number.getType() == Integer.class) { + else if (value.getType() == Integer.class) { @SuppressWarnings("unchecked") - Field f = (Field) number; + Field f = (Field) value; ctx.visit( DSL.bitAnd(f, inline(0x00000001)) .add( @@ -209,9 +209,9 @@ implements DSL.bitAnd(f, inline(0x80000000)).div(inline(0x80000000)))); return; } - else if (number.getType() == Long.class) { + else if (value.getType() == Long.class) { @SuppressWarnings("unchecked") - Field f = (Field) number; + Field f = (Field) value; ctx.visit( DSL.bitAnd(f, inline(0x0000000000000001L)) .add( @@ -282,15 +282,15 @@ implements } else { // Currently not supported - ctx.visit(N_BIT_COUNT).sql('(').visit(number).sql(')'); + ctx.visit(N_BIT_COUNT).sql('(').visit(value).sql(')'); return; } } default: { - if (number.getType() == Byte.class) { + if (value.getType() == Byte.class) { @SuppressWarnings("unchecked") - Field f = (Field) number; + Field f = (Field) value; byte i = 0; ctx.visit( @@ -304,9 +304,9 @@ implements DSL.shr(DSL.bitAnd(f, inline((byte) 0x80)), inline(++i))).cast(Integer.class)); return; } - else if (number.getType() == Short.class) { + else if (value.getType() == Short.class) { @SuppressWarnings("unchecked") - Field f = (Field) number; + Field f = (Field) value; short i = 0; ctx.visit( @@ -328,9 +328,9 @@ implements DSL.shr(DSL.bitAnd(f, inline((short) 0x8000)), inline(++i))).cast(Integer.class)); return; } - else if (number.getType() == Integer.class) { + else if (value.getType() == Integer.class) { @SuppressWarnings("unchecked") - Field f = (Field) number; + Field f = (Field) value; int i = 0; ctx.visit( @@ -368,9 +368,9 @@ implements DSL.shr(DSL.bitAnd(f, inline(0x80000000)), inline(++i)))); return; } - else if (number.getType() == Long.class) { + else if (value.getType() == Long.class) { @SuppressWarnings("unchecked") - Field f = (Field) number; + Field f = (Field) value; long i = 0; ctx.visit( @@ -442,7 +442,7 @@ implements } else { // Currently not supported - ctx.visit(N_BIT_COUNT).sql('(').visit(number).sql(')'); + ctx.visit(N_BIT_COUNT).sql('(').visit(value).sql(')'); return; } } @@ -467,12 +467,12 @@ implements // ------------------------------------------------------------------------- @Override - public final Field $number() { - return number; + public final Field $value() { + return value; } @Override - public final QOM.BitCount $number(Field newValue) { + public final QOM.BitCount $value(Field newValue) { return $constructor().apply(newValue); } @@ -509,7 +509,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.BitCount) { QOM.BitCount o = (QOM.BitCount) that; return - StringUtils.equals($number(), o.$number()) + StringUtils.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Chr.java b/jOOQ/src/main/java/org/jooq/impl/Chr.java index 853b88add6..385867f49b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Chr.java +++ b/jOOQ/src/main/java/org/jooq/impl/Chr.java @@ -72,17 +72,17 @@ implements QOM.Chr { - final Field number; + final Field value; Chr( - Field number + Field value ) { super( N_CHR, - allNotNull(VARCHAR, number) + allNotNull(VARCHAR, value) ); - this.number = nullSafeNotNull(number, INTEGER); + this.value = nullSafeNotNull(value, INTEGER); } // ------------------------------------------------------------------------- @@ -111,15 +111,15 @@ implements case MYSQL: case SQLITE: case YUGABYTEDB: - ctx.visit(function(N_CHAR, getDataType(), number)); + ctx.visit(function(N_CHAR, getDataType(), value)); break; case FIREBIRD: - ctx.visit(function(N_ASCII_CHAR, getDataType(), number)); + ctx.visit(function(N_ASCII_CHAR, getDataType(), value)); break; default: - ctx.visit(function(N_CHR, getDataType(), number)); + ctx.visit(function(N_CHR, getDataType(), value)); break; } } @@ -140,12 +140,12 @@ implements // ------------------------------------------------------------------------- @Override - public final Field $number() { - return number; + public final Field $value() { + return value; } @Override - public final QOM.Chr $number(Field newValue) { + public final QOM.Chr $value(Field newValue) { return $constructor().apply(newValue); } @@ -182,7 +182,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Chr) { QOM.Chr o = (QOM.Chr) that; return - StringUtils.equals($number(), o.$number()) + StringUtils.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Cos.java b/jOOQ/src/main/java/org/jooq/impl/Cos.java index 509bdc7fb3..d8b95cb8b8 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Cos.java +++ b/jOOQ/src/main/java/org/jooq/impl/Cos.java @@ -73,17 +73,17 @@ implements QOM.Cos { - final Field number; + final Field value; Cos( - Field number + Field value ) { super( N_COS, - allNotNull(NUMERIC, number) + allNotNull(NUMERIC, value) ); - this.number = nullSafeNotNull(number, INTEGER); + this.value = nullSafeNotNull(value, INTEGER); } // ------------------------------------------------------------------------- @@ -100,7 +100,7 @@ implements default: - ctx.visit(function(N_COS, getDataType(), number)); + ctx.visit(function(N_COS, getDataType(), value)); break; } } @@ -121,12 +121,12 @@ implements // ------------------------------------------------------------------------- @Override - public final Field $number() { - return number; + public final Field $value() { + return value; } @Override - public final QOM.Cos $number(Field newValue) { + public final QOM.Cos $value(Field newValue) { return $constructor().apply(newValue); } @@ -163,7 +163,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Cos) { QOM.Cos o = (QOM.Cos) that; return - StringUtils.equals($number(), o.$number()) + StringUtils.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Cosh.java b/jOOQ/src/main/java/org/jooq/impl/Cosh.java index 9991978656..2f8613cd43 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Cosh.java +++ b/jOOQ/src/main/java/org/jooq/impl/Cosh.java @@ -73,17 +73,17 @@ implements QOM.Cosh { - final Field number; + final Field value; Cosh( - Field number + Field value ) { super( N_COSH, - allNotNull(NUMERIC, number) + allNotNull(NUMERIC, value) ); - this.number = nullSafeNotNull(number, INTEGER); + this.value = nullSafeNotNull(value, INTEGER); } // ------------------------------------------------------------------------- @@ -119,15 +119,15 @@ implements case YUGABYTEDB: ctx.visit(idiv( iadd( - DSL.exp(imul(number, two())), + DSL.exp(imul(value, two())), one() ), - imul(DSL.exp(number), two()) + imul(DSL.exp(value), two()) )); break; default: - ctx.visit(function(N_COSH, getDataType(), number)); + ctx.visit(function(N_COSH, getDataType(), value)); break; } } @@ -148,12 +148,12 @@ implements // ------------------------------------------------------------------------- @Override - public final Field $number() { - return number; + public final Field $value() { + return value; } @Override - public final QOM.Cosh $number(Field newValue) { + public final QOM.Cosh $value(Field newValue) { return $constructor().apply(newValue); } @@ -190,7 +190,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Cosh) { QOM.Cosh o = (QOM.Cosh) that; return - StringUtils.equals($number(), o.$number()) + StringUtils.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Cot.java b/jOOQ/src/main/java/org/jooq/impl/Cot.java index a0a46fa7e0..898a317614 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Cot.java +++ b/jOOQ/src/main/java/org/jooq/impl/Cot.java @@ -73,17 +73,17 @@ implements QOM.Cot { - final Field number; + final Field value; Cot( - Field number + Field value ) { super( N_COT, - allNotNull(NUMERIC, number) + allNotNull(NUMERIC, value) ); - this.number = nullSafeNotNull(number, INTEGER); + this.value = nullSafeNotNull(value, INTEGER); } // ------------------------------------------------------------------------- @@ -106,11 +106,11 @@ implements case SQLITE: - ctx.visit(idiv(DSL.cos(number), DSL.sin(number))); + ctx.visit(idiv(DSL.cos(value), DSL.sin(value))); break; default: - ctx.visit(function(N_COT, getDataType(), number)); + ctx.visit(function(N_COT, getDataType(), value)); break; } } @@ -131,12 +131,12 @@ implements // ------------------------------------------------------------------------- @Override - public final Field $number() { - return number; + public final Field $value() { + return value; } @Override - public final QOM.Cot $number(Field newValue) { + public final QOM.Cot $value(Field newValue) { return $constructor().apply(newValue); } @@ -173,7 +173,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Cot) { QOM.Cot o = (QOM.Cot) that; return - StringUtils.equals($number(), o.$number()) + StringUtils.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Coth.java b/jOOQ/src/main/java/org/jooq/impl/Coth.java index 314a7ae465..7e65017e8b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Coth.java +++ b/jOOQ/src/main/java/org/jooq/impl/Coth.java @@ -73,17 +73,17 @@ implements QOM.Coth { - final Field number; + final Field value; Coth( - Field number + Field value ) { super( N_COTH, - allNotNull(NUMERIC, number) + allNotNull(NUMERIC, value) ); - this.number = nullSafeNotNull(number, INTEGER); + this.value = nullSafeNotNull(value, INTEGER); } // ------------------------------------------------------------------------- @@ -131,13 +131,13 @@ implements case SQLITE: case YUGABYTEDB: ctx.visit(idiv( - iadd(DSL.exp(imul(number, two())), one()), - isub(DSL.exp(imul(number, two())), one()) + iadd(DSL.exp(imul(value, two())), one()), + isub(DSL.exp(imul(value, two())), one()) )); break; default: - ctx.visit(function(N_COTH, getDataType(), number)); + ctx.visit(function(N_COTH, getDataType(), value)); break; } } @@ -158,12 +158,12 @@ implements // ------------------------------------------------------------------------- @Override - public final Field $number() { - return number; + public final Field $value() { + return value; } @Override - public final QOM.Coth $number(Field newValue) { + public final QOM.Coth $value(Field newValue) { return $constructor().apply(newValue); } @@ -200,7 +200,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Coth) { QOM.Coth o = (QOM.Coth) that; return - StringUtils.equals($number(), o.$number()) + StringUtils.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java index 568b1ca0be..4d8a457ef8 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DSL.java +++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java @@ -15825,12 +15825,12 @@ public class DSL { /** * The ABS function. * - * @param number is wrapped as {@link #val(Object)}. + * @param value is wrapped as {@link #val(Object)}. */ @NotNull @Support - public static Field abs(T number) { - return new Abs<>(Tools.field(number)); + public static Field abs(T value) { + return new Abs<>(Tools.field(value)); } /** @@ -15838,19 +15838,19 @@ public class DSL { */ @NotNull @Support - public static Field abs(Field number) { - return new Abs<>(number); + public static Field abs(Field value) { + return new Abs<>(value); } /** * The ACOS function. * - * @param number is wrapped as {@link #val(Object)}. + * @param value is wrapped as {@link #val(Object)}. */ @NotNull @Support - public static Field acos(Number number) { - return new Acos(Tools.field(number)); + public static Field acos(Number value) { + return new Acos(Tools.field(value)); } /** @@ -15858,19 +15858,19 @@ public class DSL { */ @NotNull @Support - public static Field acos(Field number) { - return new Acos(number); + public static Field acos(Field value) { + return new Acos(value); } /** * The ACOSH function. * - * @param number is wrapped as {@link #val(Object)}. + * @param value is wrapped as {@link #val(Object)}. */ @NotNull @Support - public static Field acosh(Number number) { - return new Acosh(Tools.field(number)); + public static Field acosh(Number value) { + return new Acosh(Tools.field(value)); } /** @@ -15878,19 +15878,19 @@ public class DSL { */ @NotNull @Support - public static Field acosh(Field number) { - return new Acosh(number); + public static Field acosh(Field value) { + return new Acosh(value); } /** * The ACOTH function. * - * @param number is wrapped as {@link #val(Object)}. + * @param value is wrapped as {@link #val(Object)}. */ @NotNull @Support - public static Field acoth(Number number) { - return new Acoth(Tools.field(number)); + public static Field acoth(Number value) { + return new Acoth(Tools.field(value)); } /** @@ -15898,19 +15898,19 @@ public class DSL { */ @NotNull @Support - public static Field acoth(Field number) { - return new Acoth(number); + public static Field acoth(Field value) { + return new Acoth(value); } /** * The ASIN function. * - * @param number is wrapped as {@link #val(Object)}. + * @param value is wrapped as {@link #val(Object)}. */ @NotNull @Support - public static Field asin(Number number) { - return new Asin(Tools.field(number)); + public static Field asin(Number value) { + return new Asin(Tools.field(value)); } /** @@ -15918,19 +15918,19 @@ public class DSL { */ @NotNull @Support - public static Field asin(Field number) { - return new Asin(number); + public static Field asin(Field value) { + return new Asin(value); } /** * The ASINH function. * - * @param number is wrapped as {@link #val(Object)}. + * @param value is wrapped as {@link #val(Object)}. */ @NotNull @Support - public static Field asinh(Number number) { - return new Asinh(Tools.field(number)); + public static Field asinh(Number value) { + return new Asinh(Tools.field(value)); } /** @@ -15938,19 +15938,19 @@ public class DSL { */ @NotNull @Support - public static Field asinh(Field number) { - return new Asinh(number); + public static Field asinh(Field value) { + return new Asinh(value); } /** * The ATAN function. * - * @param number is wrapped as {@link #val(Object)}. + * @param value is wrapped as {@link #val(Object)}. */ @NotNull @Support - public static Field atan(Number number) { - return new Atan(Tools.field(number)); + public static Field atan(Number value) { + return new Atan(Tools.field(value)); } /** @@ -15958,8 +15958,8 @@ public class DSL { */ @NotNull @Support - public static Field atan(Field number) { - return new Atan(number); + public static Field atan(Field value) { + return new Atan(value); } /** @@ -16008,12 +16008,12 @@ public class DSL { /** * The ATANH function. * - * @param number is wrapped as {@link #val(Object)}. + * @param value is wrapped as {@link #val(Object)}. */ @NotNull @Support - public static Field atanh(Number number) { - return new Atanh(Tools.field(number)); + public static Field atanh(Number value) { + return new Atanh(Tools.field(value)); } /** @@ -16021,8 +16021,8 @@ public class DSL { */ @NotNull @Support - public static Field atanh(Field number) { - return new Atanh(number); + public static Field atanh(Field value) { + return new Atanh(value); } /** @@ -16073,12 +16073,12 @@ public class DSL { *

* Count the number of bits set in a number * - * @param number is wrapped as {@link #val(Object)}. + * @param value is wrapped as {@link #val(Object)}. */ @NotNull @Support({ CUBRID, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE, YUGABYTEDB }) - public static Field bitCount(Number number) { - return new BitCount(Tools.field(number)); + public static Field bitCount(Number value) { + return new BitCount(Tools.field(value)); } /** @@ -16088,8 +16088,8 @@ public class DSL { */ @NotNull @Support({ CUBRID, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE, YUGABYTEDB }) - public static Field bitCount(Field number) { - return new BitCount(number); + public static Field bitCount(Field value) { + return new BitCount(value); } /** @@ -16354,12 +16354,12 @@ public class DSL { /** * The COS function. * - * @param number is wrapped as {@link #val(Object)}. + * @param value is wrapped as {@link #val(Object)}. */ @NotNull @Support - public static Field cos(Number number) { - return new Cos(Tools.field(number)); + public static Field cos(Number value) { + return new Cos(Tools.field(value)); } /** @@ -16367,19 +16367,19 @@ public class DSL { */ @NotNull @Support - public static Field cos(Field number) { - return new Cos(number); + public static Field cos(Field value) { + return new Cos(value); } /** * The COSH function. * - * @param number is wrapped as {@link #val(Object)}. + * @param value is wrapped as {@link #val(Object)}. */ @NotNull @Support - public static Field cosh(Number number) { - return new Cosh(Tools.field(number)); + public static Field cosh(Number value) { + return new Cosh(Tools.field(value)); } /** @@ -16387,19 +16387,19 @@ public class DSL { */ @NotNull @Support - public static Field cosh(Field number) { - return new Cosh(number); + public static Field cosh(Field value) { + return new Cosh(value); } /** * The COT function. * - * @param number is wrapped as {@link #val(Object)}. + * @param value is wrapped as {@link #val(Object)}. */ @NotNull @Support - public static Field cot(Number number) { - return new Cot(Tools.field(number)); + public static Field cot(Number value) { + return new Cot(Tools.field(value)); } /** @@ -16407,19 +16407,19 @@ public class DSL { */ @NotNull @Support - public static Field cot(Field number) { - return new Cot(number); + public static Field cot(Field value) { + return new Cot(value); } /** * The COTH function. * - * @param number is wrapped as {@link #val(Object)}. + * @param value is wrapped as {@link #val(Object)}. */ @NotNull @Support - public static Field coth(Number number) { - return new Coth(Tools.field(number)); + public static Field coth(Number value) { + return new Coth(Tools.field(value)); } /** @@ -16427,8 +16427,8 @@ public class DSL { */ @NotNull @Support - public static Field coth(Field number) { - return new Coth(number); + public static Field coth(Field value) { + return new Coth(value); } /** @@ -16901,12 +16901,12 @@ public class DSL { *

* Get the sign of a number and return it as any of +1, 0, -1. * - * @param number is wrapped as {@link #val(Object)}. + * @param value is wrapped as {@link #val(Object)}. */ @NotNull @Support - public static Field sign(Number number) { - return new Sign(Tools.field(number)); + public static Field sign(Number value) { + return new Sign(Tools.field(value)); } /** @@ -16916,19 +16916,19 @@ public class DSL { */ @NotNull @Support - public static Field sign(Field number) { - return new Sign(number); + public static Field sign(Field value) { + return new Sign(value); } /** * The SIN function. * - * @param number is wrapped as {@link #val(Object)}. + * @param value is wrapped as {@link #val(Object)}. */ @NotNull @Support - public static Field sin(Number number) { - return new Sin(Tools.field(number)); + public static Field sin(Number value) { + return new Sin(Tools.field(value)); } /** @@ -16936,19 +16936,19 @@ public class DSL { */ @NotNull @Support - public static Field sin(Field number) { - return new Sin(number); + public static Field sin(Field value) { + return new Sin(value); } /** * The SINH function. * - * @param number is wrapped as {@link #val(Object)}. + * @param value is wrapped as {@link #val(Object)}. */ @NotNull @Support - public static Field sinh(Number number) { - return new Sinh(Tools.field(number)); + public static Field sinh(Number value) { + return new Sinh(Tools.field(value)); } /** @@ -16956,8 +16956,8 @@ public class DSL { */ @NotNull @Support - public static Field sinh(Field number) { - return new Sinh(number); + public static Field sinh(Field value) { + return new Sinh(value); } /** @@ -17003,12 +17003,12 @@ public class DSL { /** * The TAN function. * - * @param number is wrapped as {@link #val(Object)}. + * @param value is wrapped as {@link #val(Object)}. */ @NotNull @Support - public static Field tan(Number number) { - return new Tan(Tools.field(number)); + public static Field tan(Number value) { + return new Tan(Tools.field(value)); } /** @@ -17016,19 +17016,19 @@ public class DSL { */ @NotNull @Support - public static Field tan(Field number) { - return new Tan(number); + public static Field tan(Field value) { + return new Tan(value); } /** * The TANH function. * - * @param number is wrapped as {@link #val(Object)}. + * @param value is wrapped as {@link #val(Object)}. */ @NotNull @Support - public static Field tanh(Number number) { - return new Tanh(Tools.field(number)); + public static Field tanh(Number value) { + return new Tanh(Tools.field(value)); } /** @@ -17036,8 +17036,8 @@ public class DSL { */ @NotNull @Support - public static Field tanh(Field number) { - return new Tanh(number); + public static Field tanh(Field value) { + return new Tanh(value); } /** @@ -17218,12 +17218,12 @@ public class DSL { /** * The CHR function. * - * @param number is wrapped as {@link #val(Object)}. + * @param value is wrapped as {@link #val(Object)}. */ @NotNull @Support({ FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE, YUGABYTEDB }) - public static Field chr(Number number) { - return new Chr(Tools.field(number)); + public static Field chr(Number value) { + return new Chr(Tools.field(value)); } /** @@ -17231,8 +17231,8 @@ public class DSL { */ @NotNull @Support({ FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE, YUGABYTEDB }) - public static Field chr(Field number) { - return new Chr(number); + public static Field chr(Field value) { + return new Chr(value); } /** diff --git a/jOOQ/src/main/java/org/jooq/impl/Patterns.java b/jOOQ/src/main/java/org/jooq/impl/Patterns.java index bf1a23fbca..ef0148b539 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Patterns.java +++ b/jOOQ/src/main/java/org/jooq/impl/Patterns.java @@ -1492,6 +1492,61 @@ package org.jooq.impl; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jOOQ/src/main/java/org/jooq/impl/QOM.java b/jOOQ/src/main/java/org/jooq/impl/QOM.java index f0921205db..d6e94182d3 100644 --- a/jOOQ/src/main/java/org/jooq/impl/QOM.java +++ b/jOOQ/src/main/java/org/jooq/impl/QOM.java @@ -2248,8 +2248,8 @@ public final class QOM { //permits // Abs { - @NotNull Field $number(); - @NotNull Abs $number(Field number); + @NotNull Field $value(); + @NotNull Abs $value(Field value); } /** @@ -2261,8 +2261,8 @@ public final class QOM { //permits // Acos { - @NotNull Field $number(); - @NotNull Acos $number(Field number); + @NotNull Field $value(); + @NotNull Acos $value(Field value); } /** @@ -2274,8 +2274,8 @@ public final class QOM { //permits // Acosh { - @NotNull Field $number(); - @NotNull Acosh $number(Field number); + @NotNull Field $value(); + @NotNull Acosh $value(Field value); } /** @@ -2287,8 +2287,8 @@ public final class QOM { //permits // Acoth { - @NotNull Field $number(); - @NotNull Acoth $number(Field number); + @NotNull Field $value(); + @NotNull Acoth $value(Field value); } /** @@ -2311,8 +2311,8 @@ public final class QOM { //permits // Asin { - @NotNull Field $number(); - @NotNull Asin $number(Field number); + @NotNull Field $value(); + @NotNull Asin $value(Field value); } /** @@ -2324,8 +2324,8 @@ public final class QOM { //permits // Asinh { - @NotNull Field $number(); - @NotNull Asinh $number(Field number); + @NotNull Field $value(); + @NotNull Asinh $value(Field value); } /** @@ -2337,8 +2337,8 @@ public final class QOM { //permits // Atan { - @NotNull Field $number(); - @NotNull Atan $number(Field number); + @NotNull Field $value(); + @NotNull Atan $value(Field value); } /** @@ -2365,8 +2365,8 @@ public final class QOM { //permits // Atanh { - @NotNull Field $number(); - @NotNull Atanh $number(Field number); + @NotNull Field $value(); + @NotNull Atanh $value(Field value); } /** @@ -2391,8 +2391,8 @@ public final class QOM { //permits // BitCount { - @NotNull Field $number(); - @NotNull BitCount $number(Field number); + @NotNull Field $value(); + @NotNull BitCount $value(Field value); } /** @@ -2485,8 +2485,8 @@ public final class QOM { //permits // Cos { - @NotNull Field $number(); - @NotNull Cos $number(Field number); + @NotNull Field $value(); + @NotNull Cos $value(Field value); } /** @@ -2498,8 +2498,8 @@ public final class QOM { //permits // Cosh { - @NotNull Field $number(); - @NotNull Cosh $number(Field number); + @NotNull Field $value(); + @NotNull Cosh $value(Field value); } /** @@ -2511,8 +2511,8 @@ public final class QOM { //permits // Cot { - @NotNull Field $number(); - @NotNull Cot $number(Field number); + @NotNull Field $value(); + @NotNull Cot $value(Field value); } /** @@ -2524,8 +2524,8 @@ public final class QOM { //permits // Coth { - @NotNull Field $number(); - @NotNull Coth $number(Field number); + @NotNull Field $value(); + @NotNull Coth $value(Field value); } /** @@ -2830,8 +2830,8 @@ public final class QOM { //permits // Sign { - @NotNull Field $number(); - @NotNull Sign $number(Field number); + @NotNull Field $value(); + @NotNull Sign $value(Field value); } /** @@ -2843,8 +2843,8 @@ public final class QOM { //permits // Sin { - @NotNull Field $number(); - @NotNull Sin $number(Field number); + @NotNull Field $value(); + @NotNull Sin $value(Field value); } /** @@ -2856,8 +2856,8 @@ public final class QOM { //permits // Sinh { - @NotNull Field $number(); - @NotNull Sinh $number(Field number); + @NotNull Field $value(); + @NotNull Sinh $value(Field value); } /** @@ -2906,8 +2906,8 @@ public final class QOM { //permits // Tan { - @NotNull Field $number(); - @NotNull Tan $number(Field number); + @NotNull Field $value(); + @NotNull Tan $value(Field value); } /** @@ -2919,8 +2919,8 @@ public final class QOM { //permits // Tanh { - @NotNull Field $number(); - @NotNull Tanh $number(Field number); + @NotNull Field $value(); + @NotNull Tanh $value(Field value); } /** @@ -3076,8 +3076,8 @@ public final class QOM { //permits // Chr { - @NotNull Field $number(); - @NotNull Chr $number(Field number); + @NotNull Field $value(); + @NotNull Chr $value(Field value); } /** diff --git a/jOOQ/src/main/java/org/jooq/impl/Sign.java b/jOOQ/src/main/java/org/jooq/impl/Sign.java index e71618f240..6ac80fe5de 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Sign.java +++ b/jOOQ/src/main/java/org/jooq/impl/Sign.java @@ -72,17 +72,17 @@ implements QOM.Sign { - final Field number; + final Field value; Sign( - Field number + Field value ) { super( N_SIGN, - allNotNull(INTEGER, number) + allNotNull(INTEGER, value) ); - this.number = nullSafeNotNull(number, INTEGER); + this.value = nullSafeNotNull(value, INTEGER); } // ------------------------------------------------------------------------- @@ -105,13 +105,13 @@ implements case SQLITE: - ctx.visit(when(((Field) number).gt(zero()), inline(1)) - .when(((Field) number).lt(zero()), inline(-1)) - .when(((Field) number).eq(zero()), inline(0))); + ctx.visit(when(((Field) value).gt(zero()), inline(1)) + .when(((Field) value).lt(zero()), inline(-1)) + .when(((Field) value).eq(zero()), inline(0))); break; default: - ctx.visit(function(N_SIGN, getDataType(), number)); + ctx.visit(function(N_SIGN, getDataType(), value)); break; } } @@ -132,12 +132,12 @@ implements // ------------------------------------------------------------------------- @Override - public final Field $number() { - return number; + public final Field $value() { + return value; } @Override - public final QOM.Sign $number(Field newValue) { + public final QOM.Sign $value(Field newValue) { return $constructor().apply(newValue); } @@ -174,7 +174,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Sign) { QOM.Sign o = (QOM.Sign) that; return - StringUtils.equals($number(), o.$number()) + StringUtils.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Sin.java b/jOOQ/src/main/java/org/jooq/impl/Sin.java index 81196b614b..1afc432cd6 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Sin.java +++ b/jOOQ/src/main/java/org/jooq/impl/Sin.java @@ -73,17 +73,17 @@ implements QOM.Sin { - final Field number; + final Field value; Sin( - Field number + Field value ) { super( N_SIN, - allNotNull(NUMERIC, number) + allNotNull(NUMERIC, value) ); - this.number = nullSafeNotNull(number, INTEGER); + this.value = nullSafeNotNull(value, INTEGER); } // ------------------------------------------------------------------------- @@ -100,7 +100,7 @@ implements default: - ctx.visit(function(N_SIN, getDataType(), number)); + ctx.visit(function(N_SIN, getDataType(), value)); break; } } @@ -121,12 +121,12 @@ implements // ------------------------------------------------------------------------- @Override - public final Field $number() { - return number; + public final Field $value() { + return value; } @Override - public final QOM.Sin $number(Field newValue) { + public final QOM.Sin $value(Field newValue) { return $constructor().apply(newValue); } @@ -163,7 +163,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Sin) { QOM.Sin o = (QOM.Sin) that; return - StringUtils.equals($number(), o.$number()) + StringUtils.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Sinh.java b/jOOQ/src/main/java/org/jooq/impl/Sinh.java index 0321c91f6c..8f53debef0 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Sinh.java +++ b/jOOQ/src/main/java/org/jooq/impl/Sinh.java @@ -73,17 +73,17 @@ implements QOM.Sinh { - final Field number; + final Field value; Sinh( - Field number + Field value ) { super( N_SINH, - allNotNull(NUMERIC, number) + allNotNull(NUMERIC, value) ); - this.number = nullSafeNotNull(number, INTEGER); + this.value = nullSafeNotNull(value, INTEGER); } // ------------------------------------------------------------------------- @@ -118,13 +118,13 @@ implements case POSTGRES: case YUGABYTEDB: ctx.visit(idiv( - isub(DSL.exp(imul(number, two())), one()), - imul(DSL.exp(number), two()) + isub(DSL.exp(imul(value, two())), one()), + imul(DSL.exp(value), two()) )); break; default: - ctx.visit(function(N_SINH, getDataType(), number)); + ctx.visit(function(N_SINH, getDataType(), value)); break; } } @@ -145,12 +145,12 @@ implements // ------------------------------------------------------------------------- @Override - public final Field $number() { - return number; + public final Field $value() { + return value; } @Override - public final QOM.Sinh $number(Field newValue) { + public final QOM.Sinh $value(Field newValue) { return $constructor().apply(newValue); } @@ -187,7 +187,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Sinh) { QOM.Sinh o = (QOM.Sinh) that; return - StringUtils.equals($number(), o.$number()) + StringUtils.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Tan.java b/jOOQ/src/main/java/org/jooq/impl/Tan.java index 50345c3619..93f9e5c0b1 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Tan.java +++ b/jOOQ/src/main/java/org/jooq/impl/Tan.java @@ -73,17 +73,17 @@ implements QOM.Tan { - final Field number; + final Field value; Tan( - Field number + Field value ) { super( N_TAN, - allNotNull(NUMERIC, number) + allNotNull(NUMERIC, value) ); - this.number = nullSafeNotNull(number, INTEGER); + this.value = nullSafeNotNull(value, INTEGER); } // ------------------------------------------------------------------------- @@ -100,7 +100,7 @@ implements default: - ctx.visit(function(N_TAN, getDataType(), number)); + ctx.visit(function(N_TAN, getDataType(), value)); break; } } @@ -121,12 +121,12 @@ implements // ------------------------------------------------------------------------- @Override - public final Field $number() { - return number; + public final Field $value() { + return value; } @Override - public final QOM.Tan $number(Field newValue) { + public final QOM.Tan $value(Field newValue) { return $constructor().apply(newValue); } @@ -163,7 +163,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Tan) { QOM.Tan o = (QOM.Tan) that; return - StringUtils.equals($number(), o.$number()) + StringUtils.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Tanh.java b/jOOQ/src/main/java/org/jooq/impl/Tanh.java index 1a46537e46..c8c2c1f5e7 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Tanh.java +++ b/jOOQ/src/main/java/org/jooq/impl/Tanh.java @@ -73,17 +73,17 @@ implements QOM.Tanh { - final Field number; + final Field value; Tanh( - Field number + Field value ) { super( N_TANH, - allNotNull(NUMERIC, number) + allNotNull(NUMERIC, value) ); - this.number = nullSafeNotNull(number, INTEGER); + this.value = nullSafeNotNull(value, INTEGER); } // ------------------------------------------------------------------------- @@ -118,13 +118,13 @@ implements case POSTGRES: case YUGABYTEDB: ctx.visit(idiv( - isub(DSL.exp(imul(number, two())), one()), - iadd(DSL.exp(imul(number, two())), one()) + isub(DSL.exp(imul(value, two())), one()), + iadd(DSL.exp(imul(value, two())), one()) )); break; default: - ctx.visit(function(N_TANH, getDataType(), number)); + ctx.visit(function(N_TANH, getDataType(), value)); break; } } @@ -145,12 +145,12 @@ implements // ------------------------------------------------------------------------- @Override - public final Field $number() { - return number; + public final Field $value() { + return value; } @Override - public final QOM.Tanh $number(Field newValue) { + public final QOM.Tanh $value(Field newValue) { return $constructor().apply(newValue); } @@ -187,7 +187,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Tanh) { QOM.Tanh o = (QOM.Tanh) that; return - StringUtils.equals($number(), o.$number()) + StringUtils.equals($value(), o.$value()) ; } else