[11.x] Remove Doctrine DBAL

composer.json

@@ -164,7 +164,6 @@
         "ably/ably-php": "Required to use the Ably broadcast driver (^1.0).",
         "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage, and SES mail driver (^3.235.5).",
         "brianium/paratest": "Required to run tests in parallel (^6.0).",
-        "doctrine/dbal": "Required to rename columns and drop SQLite columns (^4.0).",
         "fakerphp/faker": "Required to use the eloquent factory builder (^1.9.1).",
         "filp/whoops": "Required for friendly error pages in development (^2.14.3).",
         "guzzlehttp/guzzle": "Required to use the HTTP Client and the ping methods on schedules (^7.6).",

src/Illuminate/Database/Connection.php

@@ -6,7 +6,6 @@
 use Closure;
 use DateTimeInterface;
 use Doctrine\DBAL\Connection as DoctrineConnection;
-use Doctrine\DBAL\Types\Type;
 use Exception;
 use Illuminate\Contracts\Events\Dispatcher;
 use Illuminate\Database\Events\QueryExecuted;
@@ -196,13 +195,6 @@ class Connection implements ConnectionInterface
      */
     protected $doctrineConnection;
 
-    /**
-     * Type mappings that should be registered with new Doctrine connections.
-     *
-     * @var array<string, string>
-     */
-    protected $doctrineTypeMappings = [];
-
     /**
      * The connection resolvers.
      *
@@ -1208,52 +1200,6 @@ public function useWriteConnectionWhenReading($value = true)
         return $this;
     }
 
-    /**
-     * Is Doctrine available?
-     *
-     * @return bool
-     */
-    public function isDoctrineAvailable()
-    {
-        return class_exists('Doctrine\DBAL\Connection');
-    }
-
-    /**
-     * Indicates whether native alter operations will be used when dropping, renaming, or modifying columns, even if Doctrine DBAL is installed.
-     *
-     * @return bool
-     */
-    public function usingNativeSchemaOperations()
-    {
-        return ! $this->isDoctrineAvailable() || SchemaBuilder::$alwaysUsesNativeSchemaOperationsIfPossible;
-    }
-
-    /**
-     * Get a Doctrine Schema Column instance.
-     *
-     * @param  string  $table
-     * @param  string  $column
-     * @return \Doctrine\DBAL\Schema\Column
-     */
-    public function getDoctrineColumn($table, $column)
-    {
-        $schema = $this->getDoctrineSchemaManager();
-
-        return $schema->introspectTable($table)->getColumn($column);
-    }
-
-    /**
-     * Get the Doctrine DBAL schema manager for the connection.
-     *
-     * @return \Doctrine\DBAL\Schema\AbstractSchemaManager
-     */
-    public function getDoctrineSchemaManager()
-    {
-        $connection = $this->getDoctrineConnection();
-
-        return $connection->createSchemaManager();
-    }
-
     /**
      * Get the Doctrine DBAL database connection instance.
      *
@@ -1270,44 +1216,11 @@ public function getDoctrineConnection()
                 'driver' => $driver->getName(),
                 'serverVersion' => $this->getConfig('server_version'),
             ]), $driver);
-
-            foreach ($this->doctrineTypeMappings as $name => $type) {
-                $this->doctrineConnection
-                    ->getDatabasePlatform()
-                    ->registerDoctrineTypeMapping($type, $name);
-            }
         }
 
         return $this->doctrineConnection;
     }
 
-    /**
-     * Register a custom Doctrine mapping type.
-     *
-     * @param  Type|class-string<Type>  $class
-     * @param  string  $name
-     * @param  string  $type
-     * @return void
-     *
-     * @throws \Doctrine\DBAL\Exception
-     * @throws \RuntimeException
-     */
-    public function registerDoctrineType(Type|string $class, string $name, string $type): void
-    {
-        if (! $this->isDoctrineAvailable()) {
-            throw new RuntimeException(
-                'Registering a custom Doctrine type requires Doctrine DBAL (doctrine/dbal).'
-            );
-        }
-
-        if (! Type::hasType($name)) {
-            Type::getTypeRegistry()
-                ->register($name, is_string($class) ? new $class() : $class);
-        }
-
-        $this->doctrineTypeMappings[$name] = $type;
-    }
-
     /**
      * Get the current PDO connection.
      *
@@ -1722,6 +1635,16 @@ public function withTablePrefix(Grammar $grammar)
         return $grammar;
     }
 
+    /**
+     * Get the server version for the connection.
+     *
+     * @return string
+     */
+    public function getServerVersion(): string
+    {
+        return $this->getPdo()->getAttribute(PDO::ATTR_SERVER_VERSION);
+    }
+
     /**
      * Register a connection resolver.
      *

src/Illuminate/Database/Console/DatabaseInspectionCommand.php

@@ -2,169 +2,35 @@
 
 namespace Illuminate\Database\Console;
 
-use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Illuminate\Console\Command;
 use Illuminate\Database\ConnectionInterface;
 use Illuminate\Database\MySqlConnection;
 use Illuminate\Database\PostgresConnection;
-use Illuminate\Database\QueryException;
 use Illuminate\Database\SQLiteConnection;
 use Illuminate\Database\SqlServerConnection;
 use Illuminate\Support\Arr;
-use Illuminate\Support\Composer;
-use Symfony\Component\Process\Exception\ProcessSignaledException;
-use Symfony\Component\Process\Exception\RuntimeException;
-use Symfony\Component\Process\Process;
-
-use function Laravel\Prompts\confirm;
 
 abstract class DatabaseInspectionCommand extends Command
 {
     /**
-     * A map of database column types.
-     *
-     * @var array
-     */
-    protected $typeMappings = [
-        'bit' => 'string',
-        'citext' => 'string',
-        'enum' => 'string',
-        'geometry' => 'string',
-        'geomcollection' => 'string',
-        'linestring' => 'string',
-        'ltree' => 'string',
-        'multilinestring' => 'string',
-        'multipoint' => 'string',
-        'multipolygon' => 'string',
-        'point' => 'string',
-        'polygon' => 'string',
-        'sysname' => 'string',
-    ];
-
-    /**
-     * The Composer instance.
-     *
-     * @var \Illuminate\Support\Composer
-     */
-    protected $composer;
-
-    /**
-     * Create a new command instance.
-     *
-     * @param  \Illuminate\Support\Composer|null  $composer
-     * @return void
-     */
-    public function __construct(Composer $composer = null)
-    {
-        parent::__construct();
-
-        $this->composer = $composer ?? $this->laravel->make(Composer::class);
-    }
-
-    /**
-     * Register the custom Doctrine type mappings for inspection commands.
-     *
-     * @param  \Doctrine\DBAL\Platforms\AbstractPlatform  $platform
-     * @return void
-     */
-    protected function registerTypeMappings(AbstractPlatform $platform)
-    {
-        foreach ($this->typeMappings as $type => $value) {
-            $platform->registerDoctrineTypeMapping($type, $value);
-        }
-    }
-
-    /**
-     * Get a human-readable platform name for the given platform.
+     * Get a human-readable name for the given connection.
      *
-     * @param  \Doctrine\DBAL\Platforms\AbstractPlatform  $platform
+     * @param  \Illuminate\Database\ConnectionInterface  $connection
      * @param  string  $database
      * @return string
      */
-    protected function getPlatformName(AbstractPlatform $platform, $database)
-    {
-        return match (class_basename($platform)) {
-            'MySQLPlatform' => 'MySQL <= 5',
-            'MySQL57Platform' => 'MySQL 5.7',
-            'MySQL80Platform' => 'MySQL 8',
-            'PostgreSQL100Platform', 'PostgreSQLPlatform' => 'Postgres',
-            'SqlitePlatform' => 'SQLite',
-            'SQLServerPlatform' => 'SQL Server',
-            'SQLServer2012Platform' => 'SQL Server 2012',
-            default => $database,
-        };
-    }
-
-    /**
-     * Get the size of a table in bytes.
-     *
-     * @param  \Illuminate\Database\ConnectionInterface  $connection
-     * @param  string  $table
-     * @return int|null
-     */
-    protected function getTableSize(ConnectionInterface $connection, string $table)
+    protected function getConnectionName(ConnectionInterface $connection, $database)
     {
         return match (true) {
-            $connection instanceof MySqlConnection => $this->getMySQLTableSize($connection, $table),
-            $connection instanceof PostgresConnection => $this->getPostgresTableSize($connection, $table),
-            $connection instanceof SQLiteConnection => $this->getSqliteTableSize($connection, $table),
-            default => null,
+            $connection instanceof MySqlConnection && $connection->isMaria()  => 'MariaDB',
+            $connection instanceof MySqlConnection => 'MySQL',
+            $connection instanceof PostgresConnection => 'PostgreSQL',
+            $connection instanceof SQLiteConnection => 'SQLite',
+            $connection instanceof SqlServerConnection => 'SQL Server',
+            default => $database,
         };
     }
 
-    /**
-     * Get the size of a MySQL table in bytes.
-     *
-     * @param  \Illuminate\Database\ConnectionInterface  $connection
-     * @param  string  $table
-     * @return mixed
-     */
-    protected function getMySQLTableSize(ConnectionInterface $connection, string $table)
-    {
-        $result = $connection->selectOne('SELECT (data_length + index_length) AS size FROM information_schema.TABLES WHERE table_schema = ? AND table_name = ?', [
-            $connection->getDatabaseName(),
-            $table,
-        ]);
-
-        return Arr::wrap((array) $result)['size'];
-    }
-
-    /**
-     * Get the size of a Postgres table in bytes.
-     *
-     * @param  \Illuminate\Database\ConnectionInterface  $connection
-     * @param  string  $table
-     * @return mixed
-     */
-    protected function getPostgresTableSize(ConnectionInterface $connection, string $table)
-    {
-        $result = $connection->selectOne('SELECT pg_total_relation_size(?) AS size;', [
-            $table,
-        ]);
-
-        return Arr::wrap((array) $result)['size'];
-    }
-
-    /**
-     * Get the size of a SQLite table in bytes.
-     *
-     * @param  \Illuminate\Database\ConnectionInterface  $connection
-     * @param  string  $table
-     * @return mixed
-     */
-    protected function getSqliteTableSize(ConnectionInterface $connection, string $table)
-    {
-        try {
-            $result = $connection->selectOne('SELECT SUM(pgsize) AS size FROM dbstat WHERE name=?', [
-                $table,
-            ]);
-
-            return Arr::wrap((array) $result)['size'];
-        } catch (QueryException) {
-            return null;
-        }
-    }
-
     /**
      * Get the number of open connections for a database.
      *
@@ -175,8 +41,8 @@ protected function getConnectionCount(ConnectionInterface $connection)
     {
         $result = match (true) {
             $connection instanceof MySqlConnection => $connection->selectOne('show status where variable_name = "threads_connected"'),
-            $connection instanceof PostgresConnection => $connection->selectOne('select count(*) AS "Value" from pg_stat_activity'),
-            $connection instanceof SqlServerConnection => $connection->selectOne('SELECT COUNT(*) Value FROM sys.dm_exec_sessions WHERE status = ?', ['running']),
+            $connection instanceof PostgresConnection => $connection->selectOne('select count(*) as "Value" from pg_stat_activity'),
+            $connection instanceof SqlServerConnection => $connection->selectOne('select count(*) Value from sys.dm_exec_sessions where status = ?', ['running']),
             default => null,
         };
 
@@ -201,48 +67,18 @@ protected function getConfigFromDatabase($database)
     }
 
     /**
-     * Ensure the dependencies for the database commands are available.
-     *
-     * @return bool
-     */
-    protected function ensureDependenciesExist()
-    {
-        return tap(interface_exists('Doctrine\DBAL\Driver'), function ($dependenciesExist) {
-            if (! $dependenciesExist && confirm('Inspecting database information requires the Doctrine DBAL (doctrine/dbal) package. Would you like to install it?', default: false)) {
-                $this->installDependencies();
-            }
-        });
-    }
-
-    /**
-     * Install the command's dependencies.
-     *
-     * @return void
+     * Remove the table prefix from a table name, if it exists.
      *
-     * @throws \Symfony\Component\Process\Exception\ProcessSignaledException
+     * @param  \Illuminate\Database\ConnectionInterface  $connection
+     * @param  string  $table
+     * @return string
      */
-    protected function installDependencies()
+    protected function withoutTablePrefix(ConnectionInterface $connection, string $table)
     {
-        $command = collect($this->composer->findComposer())
-            ->push('require doctrine/dbal:^3.5.1')
-            ->implode(' ');
-
-        $process = Process::fromShellCommandline($command, null, null, null, null);
+        $prefix = $connection->getTablePrefix();
 
-        if ('\\' !== DIRECTORY_SEPARATOR && file_exists('/dev/tty') && is_readable('/dev/tty')) {
-            try {
-                $process->setTty(true);
-            } catch (RuntimeException $e) {
-                $this->components->warn($e->getMessage());
-            }
-        }
-
-        try {
-            $process->run(fn ($type, $line) => $this->output->write($line));
-        } catch (ProcessSignaledException $e) {
-            if (extension_loaded('pcntl') && $e->getSignal() !== SIGINT) {
-                throw $e;
-            }
-        }
+        return str_starts_with($table, $prefix)
+            ? substr($table, strlen($prefix))
+            : $table;
     }
 }