From 9fe180919c5be748bdec67b03e7cad69a087af5f Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Tue, 5 Jul 2022 14:49:28 +0200
Subject: [PATCH] [jOOQ/jOOQ#13764] Refactor internal schema mapping logic to
 use the new QualifiedImpl type

---
 jOOQ/src/main/java/org/jooq/impl/ArrayConstant.java    |  3 ---
 .../java/org/jooq/impl/AssociativeArrayConstant.java   |  3 ---
 jOOQ/src/main/java/org/jooq/impl/QualifiedImpl.java    | 10 +++++++---
 jOOQ/src/main/java/org/jooq/impl/SequenceImpl.java     |  6 +-----
 jOOQ/src/main/java/org/jooq/impl/TableImpl.java        |  7 +------
 jOOQ/src/main/java/org/jooq/impl/UDTImpl.java          |  5 +----
 6 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/impl/ArrayConstant.java b/jOOQ/src/main/java/org/jooq/impl/ArrayConstant.java
index f1050b07bb..1754e8e650 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ArrayConstant.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ArrayConstant.java
@@ -140,9 +140,6 @@ package org.jooq.impl;
 
 
 
-
-
-
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/AssociativeArrayConstant.java b/jOOQ/src/main/java/org/jooq/impl/AssociativeArrayConstant.java
index d856dc4531..92a67ac8bc 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AssociativeArrayConstant.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AssociativeArrayConstant.java
@@ -113,9 +113,6 @@ package org.jooq.impl;
 
 
 
-
-
-
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/QualifiedImpl.java b/jOOQ/src/main/java/org/jooq/impl/QualifiedImpl.java
index 91914a4060..cd4470e76e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/QualifiedImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/QualifiedImpl.java
@@ -37,6 +37,7 @@
  */
 package org.jooq.impl;
 
+import static org.jooq.SQLDialect.CUBRID;
 import static org.jooq.impl.Tools.getMappedSchema;
 
 import org.jooq.Catalog;
@@ -63,13 +64,16 @@ final class QualifiedImpl extends AbstractNamed implements Qualified, UTransient
     // XXX: QueryPart
     // -------------------------------------------------------------------------
 
-    @Override
-    public final void accept(Context<?> ctx) {
-        Schema mappedSchema = getMappedSchema(ctx, getSchema());
+    static final void acceptMappedSchemaPrefix(Context<?> ctx, Schema schema) {
+        Schema mappedSchema = getMappedSchema(ctx, schema);
 
         if (mappedSchema != null && !"".equals(mappedSchema.getName()))
             ctx.visit(mappedSchema).sql('.');
+    }
 
+    @Override
+    public final void accept(Context<?> ctx) {
+        acceptMappedSchemaPrefix(ctx, getSchema());
         ctx.visit(getUnqualifiedName());
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/SequenceImpl.java b/jOOQ/src/main/java/org/jooq/impl/SequenceImpl.java
index ec71c82fd2..a2b294e6a3 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SequenceImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SequenceImpl.java
@@ -343,11 +343,7 @@ implements
 
 
 
-        Schema mappedSchema = getMappedSchema(ctx, schema);
-
-        if (mappedSchema != null && !"".equals(mappedSchema.getName()) && ctx.family() != CUBRID)
-            ctx.visit(mappedSchema)
-               .sql('.');
+        QualifiedImpl.acceptMappedSchemaPrefix(ctx, getSchema());
 
         if (nameIsPlainSQL)
             ctx.sql(getName());
diff --git a/jOOQ/src/main/java/org/jooq/impl/TableImpl.java b/jOOQ/src/main/java/org/jooq/impl/TableImpl.java
index 9a418ab9b9..9f5d1de875 100644
--- a/jOOQ/src/main/java/org/jooq/impl/TableImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/TableImpl.java
@@ -410,12 +410,7 @@ implements
 
 
         )) {
-            Schema mappedSchema = Tools.getMappedSchema(ctx, getSchema());
-
-            if (mappedSchema != null && !"".equals(mappedSchema.getName())) {
-                ctx.visit(mappedSchema);
-                ctx.sql('.');
-            }
+            QualifiedImpl.acceptMappedSchemaPrefix(ctx, getSchema());
         }
 
         ctx.visit(getMappedTable(ctx, this).getUnqualifiedName());
diff --git a/jOOQ/src/main/java/org/jooq/impl/UDTImpl.java b/jOOQ/src/main/java/org/jooq/impl/UDTImpl.java
index ced8f22a71..3c8b6dfe8c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/UDTImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/UDTImpl.java
@@ -159,10 +159,7 @@ implements
 
     @Override
     public final void accept(Context<?> ctx) {
-        Schema mappedSchema = getMappedSchema(ctx, getSchema());
-
-        if (mappedSchema != null && !"".equals(mappedSchema.getName()))
-            ctx.visit(mappedSchema).sql('.');
+        QualifiedImpl.acceptMappedSchemaPrefix(ctx, getSchema());