From 7e6d66bb8b23e85c0dfba5f9f7e6aab5edaaec97 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Thu, 16 Sep 2021 14:18:31 +0200 Subject: [PATCH] [jOOQ/jOOQ#12425] Infix generation of acceptJava() for operators --- jOOQ/src/main/java/org/jooq/impl/BitAnd.java | 4 ---- jOOQ/src/main/java/org/jooq/impl/BitNand.java | 4 ---- jOOQ/src/main/java/org/jooq/impl/BitNor.java | 4 ---- jOOQ/src/main/java/org/jooq/impl/BitNot.java | 2 -- jOOQ/src/main/java/org/jooq/impl/BitOr.java | 4 ---- jOOQ/src/main/java/org/jooq/impl/BitXNor.java | 4 ---- jOOQ/src/main/java/org/jooq/impl/BitXor.java | 4 ---- jOOQ/src/main/java/org/jooq/impl/IsDistinctFrom.java | 9 +++++---- jOOQ/src/main/java/org/jooq/impl/IsNotDistinctFrom.java | 9 +++++---- jOOQ/src/main/java/org/jooq/impl/Mod.java | 4 ---- jOOQ/src/main/java/org/jooq/impl/Not.java | 2 -- jOOQ/src/main/java/org/jooq/impl/Plus.java | 2 -- jOOQ/src/main/java/org/jooq/impl/Power.java | 4 ---- jOOQ/src/main/java/org/jooq/impl/Shl.java | 4 ---- jOOQ/src/main/java/org/jooq/impl/Shr.java | 4 ---- 15 files changed, 10 insertions(+), 54 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/BitAnd.java b/jOOQ/src/main/java/org/jooq/impl/BitAnd.java index be72809a78..f777255d65 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BitAnd.java +++ b/jOOQ/src/main/java/org/jooq/impl/BitAnd.java @@ -132,10 +132,6 @@ extends - - - - // ------------------------------------------------------------------------- // The Object API // ------------------------------------------------------------------------- diff --git a/jOOQ/src/main/java/org/jooq/impl/BitNand.java b/jOOQ/src/main/java/org/jooq/impl/BitNand.java index 508967e06c..18f68da950 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BitNand.java +++ b/jOOQ/src/main/java/org/jooq/impl/BitNand.java @@ -110,10 +110,6 @@ extends - - - - // ------------------------------------------------------------------------- // The Object API // ------------------------------------------------------------------------- diff --git a/jOOQ/src/main/java/org/jooq/impl/BitNor.java b/jOOQ/src/main/java/org/jooq/impl/BitNor.java index 7d66197600..9325a8a86b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BitNor.java +++ b/jOOQ/src/main/java/org/jooq/impl/BitNor.java @@ -110,10 +110,6 @@ extends - - - - // ------------------------------------------------------------------------- // The Object API // ------------------------------------------------------------------------- diff --git a/jOOQ/src/main/java/org/jooq/impl/BitNot.java b/jOOQ/src/main/java/org/jooq/impl/BitNot.java index a52a908cd7..2d41bb042e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BitNot.java +++ b/jOOQ/src/main/java/org/jooq/impl/BitNot.java @@ -125,8 +125,6 @@ extends - - // ------------------------------------------------------------------------- // The Object API // ------------------------------------------------------------------------- diff --git a/jOOQ/src/main/java/org/jooq/impl/BitOr.java b/jOOQ/src/main/java/org/jooq/impl/BitOr.java index a7bccc88e0..361a457eb4 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BitOr.java +++ b/jOOQ/src/main/java/org/jooq/impl/BitOr.java @@ -137,10 +137,6 @@ extends - - - - // ------------------------------------------------------------------------- // The Object API // ------------------------------------------------------------------------- diff --git a/jOOQ/src/main/java/org/jooq/impl/BitXNor.java b/jOOQ/src/main/java/org/jooq/impl/BitXNor.java index 3c9f7e07fc..15ec0a8272 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BitXNor.java +++ b/jOOQ/src/main/java/org/jooq/impl/BitXNor.java @@ -110,10 +110,6 @@ extends - - - - // ------------------------------------------------------------------------- // The Object API // ------------------------------------------------------------------------- diff --git a/jOOQ/src/main/java/org/jooq/impl/BitXor.java b/jOOQ/src/main/java/org/jooq/impl/BitXor.java index 8c0aa4ff44..30d0a6aae8 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BitXor.java +++ b/jOOQ/src/main/java/org/jooq/impl/BitXor.java @@ -141,10 +141,6 @@ extends - - - - // ------------------------------------------------------------------------- // The Object API // ------------------------------------------------------------------------- diff --git a/jOOQ/src/main/java/org/jooq/impl/IsDistinctFrom.java b/jOOQ/src/main/java/org/jooq/impl/IsDistinctFrom.java index 04763439c2..37df102753 100644 --- a/jOOQ/src/main/java/org/jooq/impl/IsDistinctFrom.java +++ b/jOOQ/src/main/java/org/jooq/impl/IsDistinctFrom.java @@ -98,6 +98,11 @@ extends @Override public final void accept(Context ctx) { + + + + + if (arg1.getDataType().isEmbeddable() && arg2.getDataType().isEmbeddable()) ctx.visit(row(embeddedFields(arg1)).isDistinctFrom(row(embeddedFields(arg2)))); @@ -143,10 +148,6 @@ extends - - - - // ------------------------------------------------------------------------- // The Object API // ------------------------------------------------------------------------- diff --git a/jOOQ/src/main/java/org/jooq/impl/IsNotDistinctFrom.java b/jOOQ/src/main/java/org/jooq/impl/IsNotDistinctFrom.java index 65ce2bd4b7..c6358a36a9 100644 --- a/jOOQ/src/main/java/org/jooq/impl/IsNotDistinctFrom.java +++ b/jOOQ/src/main/java/org/jooq/impl/IsNotDistinctFrom.java @@ -86,6 +86,11 @@ extends @Override public final void accept(Context ctx) { + + + + + if (arg1.getDataType().isEmbeddable() && arg2.getDataType().isEmbeddable()) ctx.visit(row(embeddedFields(arg1)).isNotDistinctFrom(row(embeddedFields(arg2)))); @@ -137,10 +142,6 @@ extends - - - - // ------------------------------------------------------------------------- // The Object API // ------------------------------------------------------------------------- diff --git a/jOOQ/src/main/java/org/jooq/impl/Mod.java b/jOOQ/src/main/java/org/jooq/impl/Mod.java index f2effba091..3a608de9dd 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Mod.java +++ b/jOOQ/src/main/java/org/jooq/impl/Mod.java @@ -127,10 +127,6 @@ extends - - - - // ------------------------------------------------------------------------- // The Object API // ------------------------------------------------------------------------- diff --git a/jOOQ/src/main/java/org/jooq/impl/Not.java b/jOOQ/src/main/java/org/jooq/impl/Not.java index 28998bc895..663b4d27d5 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Not.java +++ b/jOOQ/src/main/java/org/jooq/impl/Not.java @@ -123,8 +123,6 @@ extends - - // ------------------------------------------------------------------------- // The Object API // ------------------------------------------------------------------------- diff --git a/jOOQ/src/main/java/org/jooq/impl/Plus.java b/jOOQ/src/main/java/org/jooq/impl/Plus.java index b9aa59cabe..d856dc4531 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Plus.java +++ b/jOOQ/src/main/java/org/jooq/impl/Plus.java @@ -117,8 +117,6 @@ package org.jooq.impl; - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Power.java b/jOOQ/src/main/java/org/jooq/impl/Power.java index ecb2e76b21..f27068a7c5 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Power.java +++ b/jOOQ/src/main/java/org/jooq/impl/Power.java @@ -123,10 +123,6 @@ extends - - - - // ------------------------------------------------------------------------- // The Object API // ------------------------------------------------------------------------- diff --git a/jOOQ/src/main/java/org/jooq/impl/Shl.java b/jOOQ/src/main/java/org/jooq/impl/Shl.java index 2cd8564d50..c9cada7b90 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Shl.java +++ b/jOOQ/src/main/java/org/jooq/impl/Shl.java @@ -140,10 +140,6 @@ extends - - - - // ------------------------------------------------------------------------- // The Object API // ------------------------------------------------------------------------- diff --git a/jOOQ/src/main/java/org/jooq/impl/Shr.java b/jOOQ/src/main/java/org/jooq/impl/Shr.java index 63f3b17208..58bb0128bf 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Shr.java +++ b/jOOQ/src/main/java/org/jooq/impl/Shr.java @@ -140,10 +140,6 @@ extends - - - - // ------------------------------------------------------------------------- // The Object API // -------------------------------------------------------------------------