Remove support dots in table names (#380)

Author: Tigrov

CHANGELOG.md

@@ -50,6 +50,7 @@
 - Enh #372: Provide `yiisoft/db-implementation` virtual package (@vjik)
 - Enh #375: Adapt to `Param` refactoring in `yiisoft/db` package (@vjik)
 - Enh #376: Adapt to conditions refactoring in `yiisoft/db` package (@vjik)
+- Enh #380: Remove support dots in table names (@Tigrov)
 
 ## 1.2.0 March 21, 2024
 

src/Quoter.php

@@ -8,31 +8,17 @@
 
 use function array_map;
 use function array_slice;
-use function preg_match;
-use function preg_match_all;
+use function explode;
 
 /**
  * Implements the MSSQL Server quoting and unquoting methods.
  */
 final class Quoter extends BaseQuoter
 {
-    public function quoteColumnName(string $name): string
-    {
-        if (preg_match('/^\[.*]$/', $name)) {
-            return $name;
-        }
-
-        return parent::quoteColumnName($name);
-    }
-
     public function getTableNameParts(string $name, bool $withColumn = false): array
     {
-        if (preg_match_all('/([^.\[\]]+)|\[([^\[\]]+)]/', $name, $matches) > 0) {
-            $parts = array_slice($matches[0], -4, 4);
-
-            return array_map($this->unquoteSimpleTableName(...), $parts);
-        }
+        $parts = array_slice(explode('.', $name), -4, 4);
 
-        return [$this->unquoteSimpleTableName($name)];
+        return array_map($this->unquoteSimpleTableName(...), $parts);
     }
 }

tests/Provider/QuoterProvider.php

@@ -47,8 +47,8 @@ public static function tableNameParts(): array
             ['catalog.other.animal2', 'animal2', 'other', 'catalog'],
             ['server.catalog.other.animal2', 'animal2', 'other', 'catalog', 'server'],
             ['unknown_part.server.catalog.other.animal2', 'animal2', 'other', 'catalog', 'server'],
-            ['[[dbo]].[[animal]]', 'animal', 'dbo'],
-            ['[[other]].[[animal2]]', 'animal2', 'other'],
+            ['{{dbo}}.{{animal}}', '{{animal}}', '{{dbo}}'],
+            ['{{other}}.{{animal2}}', '{{animal2}}', '{{other}}'],
         ];
     }
 }

tests/Support/Fixture/mssql.sql

@@ -28,7 +28,6 @@ IF OBJECT_ID('[T_constraints_1]', 'U') IS NOT NULL DROP TABLE [T_constraints_1];
 IF OBJECT_ID('[T_upsert]', 'U') IS NOT NULL DROP TABLE [T_upsert];
 IF OBJECT_ID('[T_upsert_1]', 'U') IS NOT NULL DROP TABLE [T_upsert_1];
 IF OBJECT_ID('[T_upsert_varbinary]', 'U') IS NOT NULL DROP TABLE [T_upsert_varbinary];
-IF OBJECT_ID('[table.with.special.characters]', 'U') IS NOT NULL DROP TABLE [table.with.special.characters];
 IF OBJECT_ID('[foo1]', 'U') IS NOT NULL DROP TABLE [foo1];
 IF OBJECT_ID('[stranger ''table]', 'U') IS NOT NULL DROP TABLE [stranger 'table];
 
@@ -356,10 +355,6 @@ CREATE TABLE [T_upsert_1]
     [a] INT NOT NULL PRIMARY KEY
 );
 
-CREATE TABLE [dbo].[table.with.special.characters] (
-    [id] [int]
-);
-
 CREATE TABLE [T_upsert_varbinary]
 (
     [id] INT NOT NULL,