Remove PDO folders in subpackages (#112)

darkdef · web-flow · commit b15801e63c69 · 2022-06-14T22:46:16.000+03:00
diff --git a/src/CommandPDO.php b/src/CommandPDO.php
@@ -2,18 +2,16 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Db\Sqlite\PDO;
+namespace Yiisoft\Db\Sqlite;
 
 use PDOException;
 use Throwable;
-use Yiisoft\Db\Driver\PDO\CommandPDO;
+use Yiisoft\Db\Driver\PDO\CommandPDO as AbstractCommandPDO;
 use Yiisoft\Db\Exception\ConvertException;
 use Yiisoft\Db\Exception\Exception;
 use Yiisoft\Db\Exception\InvalidArgumentException;
 use Yiisoft\Db\QueryBuilder\QueryBuilderInterface;
 use Yiisoft\Db\Schema\SchemaInterface;
-use Yiisoft\Db\Sqlite\SqlToken;
-use Yiisoft\Db\Sqlite\SqlTokenizer;
 use Yiisoft\Strings\StringHelper;
 
 use function array_pop;
@@ -22,7 +20,7 @@
 use function preg_match_all;
 use function strpos;
 
-final class CommandPDOSqlite extends CommandPDO
+final class CommandPDO extends AbstractCommandPDO
 {
     /**
      * @inheritDoc
diff --git a/src/ConnectionPDO.php b/src/ConnectionPDO.php
@@ -2,26 +2,25 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Db\Sqlite\PDO;
+namespace Yiisoft\Db\Sqlite;
 
 use PDO;
 use Yiisoft\Db\Driver\PDO\CommandPDOInterface;
-use Yiisoft\Db\Driver\PDO\ConnectionPDO;
+use Yiisoft\Db\Driver\PDO\ConnectionPDO as AbstractConnectionPDO;
 use Yiisoft\Db\Exception\Exception;
 use Yiisoft\Db\Exception\InvalidConfigException;
 use Yiisoft\Db\QueryBuilder\QueryBuilderInterface;
 use Yiisoft\Db\Schema\Quoter;
 use Yiisoft\Db\Schema\QuoterInterface;
 use Yiisoft\Db\Schema\SchemaInterface;
-use Yiisoft\Db\Sqlite\Schema;
 use Yiisoft\Db\Transaction\TransactionInterface;
 
 use function strncmp;
 
 /**
  * Database connection class prefilled for SQLite Server.
  */
-final class ConnectionPDOSqlite extends ConnectionPDO
+final class ConnectionPDO extends AbstractConnectionPDO
 {
     /**
      * Reset the connection after cloning.
@@ -38,7 +37,7 @@ public function __clone()
 
     public function createCommand(?string $sql = null, array $params = []): CommandPDOInterface
     {
-        $command = new CommandPDOSqlite($this, $this->queryCache);
+        $command = new CommandPDO($this, $this->queryCache);
 
         if ($sql !== null) {
             $command->setSql($sql);
@@ -57,7 +56,7 @@ public function createCommand(?string $sql = null, array $params = []): CommandP
 
     public function createTransaction(): TransactionInterface
     {
-        return new TransactionPDOSqlite($this);
+        return new TransactionPDO($this);
     }
 
     /**
@@ -66,7 +65,7 @@ public function createTransaction(): TransactionInterface
     public function getQueryBuilder(): QueryBuilderInterface
     {
         if ($this->queryBuilder === null) {
-            $this->queryBuilder = new QueryBuilderPDOSqlite(
+            $this->queryBuilder = new QueryBuilder(
                 $this->getQuoter(),
                 $this->getSchema(),
             );
diff --git a/src/PDODriver.php b/src/PDODriver.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Db\Sqlite\PDO;
+namespace Yiisoft\Db\Sqlite;
 
 use PDO;
 use Yiisoft\Db\Driver\PDO\PDODriver as AbstractPDODriver;
diff --git a/src/QueryBuilder.php b/src/QueryBuilder.php
@@ -2,17 +2,14 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Db\Sqlite\PDO;
+namespace Yiisoft\Db\Sqlite;
 
-use Yiisoft\Db\QueryBuilder\QueryBuilder;
+use Yiisoft\Db\QueryBuilder\QueryBuilder as AbstractQueryBuilder;
 use Yiisoft\Db\Schema\QuoterInterface;
 use Yiisoft\Db\Schema\Schema;
 use Yiisoft\Db\Schema\SchemaInterface;
-use Yiisoft\Db\Sqlite\DDLQueryBuilder;
-use Yiisoft\Db\Sqlite\DMLQueryBuilder;
-use Yiisoft\Db\Sqlite\DQLQueryBuilder;
 
-final class QueryBuilderPDOSqlite extends QueryBuilder
+final class QueryBuilder extends AbstractQueryBuilder
 {
     /**
      * @var array mapping from abstract column types (keys) to physical column types (values).
diff --git a/src/TransactionPDO.php b/src/TransactionPDO.php
@@ -2,16 +2,16 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Db\Sqlite\PDO;
+namespace Yiisoft\Db\Sqlite;
 
 use Throwable;
-use Yiisoft\Db\Driver\PDO\TransactionPDO;
+use Yiisoft\Db\Driver\PDO\TransactionPDO as AbstractTransactionPDO;
 use Yiisoft\Db\Exception\Exception;
 use Yiisoft\Db\Exception\InvalidConfigException;
 use Yiisoft\Db\Exception\NotSupportedException;
 use Yiisoft\Db\Transaction\TransactionInterface;
 
-final class TransactionPDOSqlite extends TransactionPDO
+final class TransactionPDO extends AbstractTransactionPDO
 {
     /**
      * Sets the isolation level of the current transaction.
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -6,8 +6,8 @@
 
 use Exception;
 use PHPUnit\Framework\TestCase as AbstractTestCase;
-use Yiisoft\Db\Sqlite\PDO\PDODriver;
-use Yiisoft\Db\Sqlite\PDO\ConnectionPDOSqlite;
+use Yiisoft\Db\Sqlite\PDODriver;
+use Yiisoft\Db\Sqlite\ConnectionPDO;
 use Yiisoft\Db\TestSupport\TestTrait;
 
 class TestCase extends AbstractTestCase
@@ -22,21 +22,21 @@ class TestCase extends AbstractTestCase
     protected array $dataProvider;
     protected string $likeEscapeCharSql = '';
     protected array $likeParameterReplacements = [];
-    protected ConnectionPDOSqlite $db;
+    protected ConnectionPDO $db;
 
     /**
      * @param bool $reset whether to clean up the test database.
      *
-     * @return ConnectionPDOSqlite
+     * @return ConnectionPDO
      */
     protected function getConnection(
         $reset = false,
         string $dsn = 'sqlite:' . __DIR__ . '/Runtime/yiitest.sq3',
         string $fixture = __DIR__ . '/Fixture/sqlite.sql'
-    ): ConnectionPDOSqlite {
+    ): ConnectionPDO {
         $this->dsn = $dsn;
         $pdoDriver = new PDODriver($this->dsn, $this->username, $this->password);
-        $this->db = new ConnectionPDOSqlite($pdoDriver, $this->createQueryCache(), $this->createSchemaCache());
+        $this->db = new ConnectionPDO($pdoDriver, $this->createQueryCache(), $this->createSchemaCache());
         $this->db->setLogger($this->createLogger());
         $this->db->setProfiler($this->createProfiler());
 
