From 7ae7a1ee8dff0d06f1023e6978b9f24998cc3d0f Mon Sep 17 00:00:00 2001 From: Harald Leithner Date: Tue, 18 Mar 2025 19:49:58 +0100 Subject: [PATCH 1/2] Replace incorrect working quoteNameStr method --- src/DatabaseDriver.php | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/src/DatabaseDriver.php b/src/DatabaseDriver.php index 7f3fc332..f8c3b70a 100644 --- a/src/DatabaseDriver.php +++ b/src/DatabaseDriver.php @@ -1702,27 +1702,7 @@ protected function quoteNameString($name, $asSinglePart = false) */ protected function quoteNameStr($strArr) { - $parts = []; - $q = $this->nameQuote; - - foreach ($strArr as $part) - { - if ($part === null) - { - continue; - } - - if (\strlen($q) === 1) - { - $parts[] = $q . $part . $q; - } - else - { - $parts[] = $q[0] . $part . $q[1]; - } - } - - return implode('.', $parts); + return $this->quoteNameString(implode('.', $strArr)); } /** From 49252d21b275730a00807d28d5003d9f690433da Mon Sep 17 00:00:00 2001 From: Harald Leithner Date: Sat, 22 Mar 2025 14:24:59 +0100 Subject: [PATCH 2/2] Update src/DatabaseDriver.php Co-authored-by: Richard Fath --- src/DatabaseDriver.php | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/DatabaseDriver.php b/src/DatabaseDriver.php index f8c3b70a..79257d94 100644 --- a/src/DatabaseDriver.php +++ b/src/DatabaseDriver.php @@ -1702,7 +1702,19 @@ protected function quoteNameString($name, $asSinglePart = false) */ protected function quoteNameStr($strArr) { - return $this->quoteNameString(implode('.', $strArr)); + $parts = []; + + foreach ($strArr as $part) + { + if ($part === null) + { + continue; + } + + $parts[] = quoteNameString($part, true); + } + + return implode('.', $parts); } /**