From d46b8daecff9cd68b3ac1f8b60280b97dfa3afdc Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Tue, 13 Jul 2021 17:32:04 +0200
Subject: [PATCH] [jOOQ/jOOQ#12168] Deeply nested MULTISET produce quoted JSON
 in MariaDB

---
 jOOQ/src/main/java/org/jooq/impl/DSL.java        | 2 +-
 jOOQ/src/main/java/org/jooq/impl/JSONObject.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java
index b0af91d641..fd1668c581 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DSL.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java
@@ -23843,7 +23843,7 @@ public class DSL {
      * {@link SelectForStep#forXML()}. jOOQ produces an XML encoding that is
      * compatible with {@link DSLContext#fetchFromXML(String)}. Future jOOQ
      * versions will make this format configurable according to
-     * {@link XMLFormat.RecordFormau}.</li>
+     * {@link XMLFormat.RecordFormat}.</li>
      * <li>{@link NestedCollectionEmulation#NATIVE}: A few dialects have native
      * support for MULTISET.</li>
      * <li>{@link NestedCollectionEmulation#DEFAULT}: By default, jOOQ chooses
diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONObject.java b/jOOQ/src/main/java/org/jooq/impl/JSONObject.java
index de69e61ab1..65f93d9dd0 100644
--- a/jOOQ/src/main/java/org/jooq/impl/JSONObject.java
+++ b/jOOQ/src/main/java/org/jooq/impl/JSONObject.java
@@ -185,11 +185,11 @@ implements
 
                 // Workaround for https://jira.mariadb.org/browse/MDEV-13701
                 if (entries.size() > 1) {
-                    ctx.visit(jsonMerge(ctx, "{}", Tools.map(entries, e -> jsonObject(e), Field[]::new)));
+                    ctx.visit(JSONEntryImpl.jsonMerge(ctx, "{}", Tools.map(entries, e -> jsonObject(e), Field[]::new)));
                 }
                 else if (!entries.isEmpty() && isJSONArray((first = entries.iterator().next()).value())) {
                     ctx.visit(jsonObject(
-                        key(first.key()).value(jsonMerge(ctx, "[]", first.value()))
+                        key(first.key()).value(JSONEntryImpl.jsonMerge(ctx, "[]", first.value()))
                     ));
                 }
                 else