Fix quoting array column name (#481)

Author: Tigrov

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 - Enh #477, #478: Improve performance of `ArrayParser::parse()` method (@Tigrov)
 - Enh #478: Improve performance of `StructuredParser::parse()` method (@Tigrov)
+- Bug #481: Fix quoting array column names (@Tigrov)
 - Enh #479: Explicitly import functions and constants in "use" section (@mspirkov)
 - Enh #480: Remove unnecessary files from Composer package (@mspirkov)
 

src/Connection.php

@@ -11,7 +11,6 @@
 use Yiisoft\Db\Pgsql\Column\ColumnFactory;
 use Yiisoft\Db\QueryBuilder\QueryBuilderInterface;
 use Yiisoft\Db\Schema\Column\ColumnFactoryInterface;
-use Yiisoft\Db\Schema\Quoter;
 use Yiisoft\Db\Schema\QuoterInterface;
 use Yiisoft\Db\Schema\SchemaInterface;
 use Yiisoft\Db\Transaction\TransactionInterface;

src/Quoter.php

@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Db\Pgsql;
+
+use function str_contains;
+use function strpos;
+use function strrpos;
+use function substr;
+
+final class Quoter extends \Yiisoft\Db\Schema\Quoter
+{
+    public function quoteColumnName(string $name): string
+    {
+        if (str_contains($name, '(') || str_contains($name, '[[')) {
+            return $name;
+        }
+
+        $dotPos = strrpos($name, '.');
+        if ($dotPos !== false) {
+            $prefix = $this->quoteTableName(substr($name, 0, $dotPos)) . '.';
+            $name = substr($name, $dotPos + 1);
+        } else {
+            $prefix = '';
+        }
+
+        if (str_contains($name, '{{')) {
+            return $name;
+        }
+
+        $bracketPos = strpos($name, '[');
+        if ($bracketPos !== false) {
+            $suffix = substr($name, $bracketPos);
+            $name = substr($name, 0, $bracketPos);
+        } else {
+            $suffix = '';
+        }
+
+        return $prefix . $this->quoteSimpleColumnName($name) . $suffix;
+    }
+}

tests/Provider/QuoterProvider.php

@@ -6,6 +6,18 @@
 
 final class QuoterProvider extends \Yiisoft\Db\Tests\Provider\QuoterProvider
 {
+    public static function columnNames(): array
+    {
+        return [
+            ...parent::columnNames(),
+            ['array_col[1]', '"array_col"[1]'],
+            ['multi_array_col[1][2]', '"multi_array_col"[1][2]'],
+            ['table_name.array_col[1]', '"table_name"."array_col"[1]'],
+            ['[[array_col]][1]', '[[array_col]][1]'],
+            ['(array_col[1])', '(array_col[1])'],
+        ];
+    }
+
     public static function tableNameParts(): array
     {
         return [

tests/QuoterTest.php

@@ -16,6 +16,12 @@ final class QuoterTest extends CommonQuoterTest
 {
     use IntegrationTestTrait;
 
+    #[DataProviderExternal(QuoterProvider::class, 'columnNames')]
+    public function testQuoteColumnName(string $columnName, string $expected): void
+    {
+        parent::testQuoteColumnName($columnName, $expected);
+    }
+
     #[DataProviderExternal(QuoterProvider::class, 'tableNameParts')]
     public function testGetTableNameParts(string $tableName, array $expected): void
     {