Remove extended class of Phalcon PDO and Dialect

phalcon · Mar 21, 2020 · 58c383b · 58c383b
1 parent a6bc4e2
commit 58c383b
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 309 deletions.
diff --git a/src/Db/Adapter/Pdo/PdoPostgresql.php b/src/Db/Adapter/Pdo/PdoPostgresql.php
diff --git a/src/Db/Dialect/DialectMysql.php b/src/Db/Dialect/DialectMysql.php
diff --git a/src/Db/Dialect/DialectPostgresql.php b/src/Db/Dialect/DialectPostgresql.php
diff --git a/src/Migrations.php b/src/Migrations.php
@@ -21,8 +21,6 @@
 use Phalcon\Db\Exception as DbException;
 use Phalcon\Migrations\Console\Color;
 use Phalcon\Migrations\Console\OptionStack;
-use Phalcon\Migrations\Db\Dialect\DialectMysql;
-use Phalcon\Migrations\Db\Dialect\DialectPostgresql;
 use Phalcon\Migrations\Exception\RuntimeException;
 use Phalcon\Migrations\Mvc\Model\Migration as ModelMigration;
 use Phalcon\Migrations\Mvc\Model\Migration\TableAware\ListTablesDb;
@@ -493,14 +491,9 @@ private static function connectionSetup(array $options): void
             self::$storage = new $adapter($configArray);
 
             if ($database->adapter === 'Mysql') {
-                self::$storage->setDialect(new DialectMysql());
                 self::$storage->query('SET FOREIGN_KEY_CHECKS=0');
             }
 
-            if ($database->adapter == 'Postgresql') {
-                self::$storage->setDialect(new DialectPostgresql());
-            }
-
             if (!self::$storage->tableExists(self::MIGRATION_LOG_TABLE)) {
                 self::createLogTable();
             }

diff --git a/src/Mvc/Model/Migration.php b/src/Mvc/Model/Migration.php
@@ -18,14 +18,12 @@
 use Phalcon\Config;
 use Phalcon\Db\Adapter\AbstractAdapter;
 use Phalcon\Db\Adapter\Pdo\Mysql as PdoMysql;
+use Phalcon\Db\Adapter\Pdo\Postgresql as PdoPostgresql;
 use Phalcon\Db\ColumnInterface;
 use Phalcon\Db\Enum;
 use Phalcon\Db\Exception as DbException;
 use Phalcon\Db\ReferenceInterface;
 use Phalcon\Events\Manager as EventsManager;
-use Phalcon\Migrations\Db\Adapter\Pdo\PdoPostgresql;
-use Phalcon\Migrations\Db\Dialect\DialectMysql;
-use Phalcon\Migrations\Db\Dialect\DialectPostgresql;
 use Phalcon\Migrations\Exception\Db\UnknownColumnTypeException;
 use Phalcon\Migrations\Generator\Snippet;
 use Phalcon\Migrations\Listeners\DbProfilerListener;
@@ -93,7 +91,6 @@ class Migration
      * @param Config $database Database config
      * @param bool $verbose array with settings
      * @throws DbException
-     * @since 3.2.1 Using Postgresql::describeReferences and DialectPostgresql dialect class
      */
     public static function setup(Config $database, bool $verbose = false): void
     {
@@ -123,16 +120,6 @@ public static function setup(Config $database, bool $verbose = false): void
         self::$connection = new $adapter($configArray);
         self::$databaseConfig = $database;
 
-        // Connection custom dialect Dialect/DialectMysql
-        if ($database->adapter == 'Mysql') {
-            self::$connection->setDialect(new DialectMysql());
-        }
-
-        // Connection custom dialect Dialect/DialectPostgresql
-        if ($database->adapter == 'Postgresql') {
-            self::$connection->setDialect(new DialectPostgresql());
-        }
-
         if (!Migrations::isConsole() || !$verbose) {
             return;
         }

diff --git a/tests/unit/Db/Adapter/Pdo/PdoPostgresqlTest.php b/tests/unit/Db/Adapter/Pdo/PdoPostgresqlTest.php
diff --git a/tests/unit/Db/Dialect/DialectMysqlTest.php b/tests/unit/Db/Dialect/DialectMysqlTest.php
diff --git a/tests/unit/Db/Dialect/DialectPostgresqlTest.php b/tests/unit/Db/Dialect/DialectPostgresqlTest.php