[3.0] Removed drizzle support.

UPGRADE.md

@@ -1,3 +1,10 @@
+# Upgrade to 2.6
+
+## BC BREAK: Drizzle support have been removed.
+
+Project is dead. Development have stopped and project pages like http://docs.drizzle.org/ has
+been down in a very long time.
+
 # Upgrade to 2.5.1
 
 ## MINOR BC BREAK: Doctrine\DBAL\Schema\Table

docs/en/reference/configuration.rst

@@ -73,11 +73,8 @@ full driver name::
 
     pdo-mysql://localhost:4486/foo?charset=UTF-8
 
-If you wanted to use the ``drizzle_pdo__mysql`` driver instead::
 
-    drizzle-pdo-mysql://localhost:4486/foo?charset=UTF-8
-
-In the two last example above, mind the dashes instead of the
+In the example above, mind the dashes instead of the
 underscores in the URL schemes.
 
 For connecting to an SQLite database, the authority portion of the
@@ -130,8 +127,6 @@ interfaces to use. It can be configured in one of three ways:
 
    -  ``pdo_mysql``: A MySQL driver that uses the pdo\_mysql PDO
       extension.
-   -  ``drizzle_pdo_mysql``: A Drizzle driver that uses pdo\_mysql PDO
-      extension.
    -  ``mysqli``: A MySQL driver that uses the mysqli extension.
    -  ``pdo_sqlite``: An SQLite driver that uses the pdo\_sqlite PDO
       extension.
@@ -203,23 +198,6 @@ pdo\_mysql
 -  ``charset`` (string): The charset used when connecting to the
    database.
 
-drizzle\_pdo\_mysql
-^^^^^^^^^^^^^^^^^^^
-
-**Requires** drizzle plugin ``mysql_protocol`` or ``mysql_unix_socket_protocol`` to be enabled.
-On Ubuntu this can be done by editing ``/etc/drizzle/conf.d/mysql-protocol.cnf``
-or ``/etc/drizzle/conf.d/mysql-unix-socket-protocol.cnf`` and restart drizzled daemon.
-
--  ``user`` (string): Username to use when connecting to the
-   database. Only needed if authentication is configured for drizzled.
--  ``password`` (string): Password to use when connecting to the
-   database. Only needed if authentication is configured for drizzled.
--  ``host`` (string): Hostname of the database to connect to.
--  ``port`` (integer): Port of the database to connect to.
--  ``dbname`` (string): Name of the database/schema to connect to.
--  ``unix_socket`` (string): Name of the socket used to connect to
-   the database.
-
 mysqli
 ^^^^^^
 
@@ -285,7 +263,7 @@ pdo\_oci / oci8
    database.
 -  ``instancename`` (string): Optional parameter, complete whether to
    add the INSTANCE_NAME parameter in the connection. It is generally used
-   to connect to an Oracle RAC server to select the name of a particular instance.   
+   to connect to an Oracle RAC server to select the name of a particular instance.
 
 
 pdo\_sqlsrv / sqlsrv

docs/en/reference/introduction.rst

@@ -21,7 +21,6 @@ The following database vendors are currently supported:
 - PostgreSQL
 - SAP Sybase SQL Anywhere
 - SQLite
-- Drizzle
 
 The Doctrine 2 database layer can be used independently of the
 object-relational mapper. In order to use the DBAL all you need is

docs/en/reference/platforms.rst

@@ -69,11 +69,6 @@ SQLite
 
 -  ``SqlitePlatform`` for all versions.
 
-Drizzle
-^^^^^^
-
--  ``DrizzlePlatform`` for all versions.
-
 It is highly encouraged to use the platform class that matches your
 database vendor and version best. Otherwise it is not guaranteed
 that the compatibility in terms of SQL dialect and feature support

docs/en/reference/schema-representation.rst

@@ -115,10 +115,10 @@ The following options are not completely portable but are supported by most of t
 vendors:
 
 -  **unsigned** (boolean): Whether a ``smallint``, ``integer`` or ``bigint`` Doctrine
-   type column should allow unsigned values only. Supported by MySQL, SQL Anywhere
-   and Drizzle. Defaults to ``false``.
+   type column should allow unsigned values only. Supported by MySQL and SQL Anywhere.
+   Defaults to ``false``.
 -  **comment** (integer|string): The column comment. Supported by MySQL, PostgreSQL,
-   Oracle, SQL Server, SQL Anywhere and Drizzle. Defaults to ``null``.
+   Oracle, SQL Server and SQL Anywhere. Defaults to ``null``.
 
 Vendor specific options
 ^^^^^^^^^^^^^^^^^^^^^^^
@@ -133,7 +133,7 @@ The following options are completely vendor specific and absolutely not portable
    supported by some vendors but not portable:
 
    -  **charset** (string): The character set to use for the column. Currently only supported
-      on MySQL and Drizzle.
+      on MySQL.
    -  **collate** (string): The collation to use for the column. Currently only supported on
       SQL Server.
    -  **check** (string): The check constraint clause to add to the column.

lib/Doctrine/DBAL/DriverManager.php

@@ -46,7 +46,6 @@ final class DriverManager
          'ibm_db2'            => 'Doctrine\DBAL\Driver\IBMDB2\DB2Driver',
          'pdo_sqlsrv'         => 'Doctrine\DBAL\Driver\PDOSqlsrv\Driver',
          'mysqli'             => 'Doctrine\DBAL\Driver\Mysqli\Driver',
-         'drizzle_pdo_mysql'  => 'Doctrine\DBAL\Driver\DrizzlePDOMySql\Driver',
          'sqlanywhere'        => 'Doctrine\DBAL\Driver\SQLAnywhere\Driver',
          'sqlsrv'             => 'Doctrine\DBAL\Driver\SQLSrv\Driver',
     );
@@ -92,7 +91,6 @@ private function __construct()
      *     sqlanywhere
      *     sqlsrv
      *     ibm_db2 (unstable)
-     *     drizzle_pdo_mysql
      *
      * OR 'driverClass' that contains the full class name (with namespace) of the
      * driver class to instantiate.
@@ -142,7 +140,7 @@ public static function getConnection(
         }
 
         $params = self::parseDatabaseUrl($params);
-        
+
         // check for existing pdo object
         if (isset($params['pdo']) && ! $params['pdo'] instanceof \PDO) {
             throw DBALException::invalidPdoInstance();
@@ -227,23 +225,23 @@ private static function parseDatabaseUrl(array $params)
         if (!isset($params['url'])) {
             return $params;
         }
-        
+
         // (pdo_)?sqlite3?:///... => (pdo_)?sqlite3?://localhost/... or else the URL will be invalid
         $url = preg_replace('#^((?:pdo_)?sqlite3?):///#', '$1://localhost/', $params['url']);
-        
+
         $url = parse_url($url);
-        
+
         if ($url === false) {
             throw new DBALException('Malformed parameter "url".');
         }
-        
+
         if (isset($url['scheme'])) {
             $params['driver'] = str_replace('-', '_', $url['scheme']); // URL schemes must not contain underscores, but dashes are ok
             if (isset(self::$driverSchemeAliases[$params['driver']])) {
                 $params['driver'] = self::$driverSchemeAliases[$params['driver']]; // use alias like "postgres", else we just let checkParams decide later if the driver exists (for literal "pdo-pgsql" etc)
             }
         }
-        
+
         if (isset($url['host'])) {
             $params['host'] = $url['host'];
         }
@@ -256,21 +254,21 @@ private static function parseDatabaseUrl(array $params)
         if (isset($url['pass'])) {
             $params['password'] = $url['pass'];
         }
-        
+
         if (isset($url['path'])) {
             if (!isset($url['scheme']) || (strpos($url['scheme'], 'sqlite') !== false && $url['path'] == ':memory:')) {
                 $params['dbname'] = $url['path']; // if the URL was just "sqlite::memory:", which parses to scheme and path only
             } else {
                 $params['dbname'] = substr($url['path'], 1); // strip the leading slash from the URL
             }
         }
-        
+
         if (isset($url['query'])) {
             $query = array();
             parse_str($url['query'], $query); // simply ingest query as extra params, e.g. charset or sslmode
             $params = array_merge($params, $query); // parse_str wipes existing array elements
         }
-        
+
         return $params;
     }
 }