Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions UPGRADE.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ After:
$stmt->bindValue(1, 1, ParameterType::INTEGER);
$stmt->fetchAll(FetchMode::COLUMN);

## BC BREAK: Removed Drizzle support

The Drizzle project is abandoned and is therefore not supported by Doctrine DBAL anymore.

# Upgrade to 2.7

## Doctrine\DBAL\Platforms\AbstractPlatform::DATE_INTERVAL_UNIT_* constants deprecated
Expand Down
27 changes: 2 additions & 25 deletions docs/en/reference/configuration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +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 last two examples above, mind the dashes instead of the
underscores in the URL schemes.
In the example above, mind the dashes instead of the
underscores in the URL scheme.

For connecting to an SQLite database, the authority portion of the
URL is obviously irrelevant and thus can be omitted. The path part
Expand Down Expand Up @@ -128,8 +124,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.
Expand Down Expand Up @@ -198,23 +192,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 restarting the 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
^^^^^^

Expand Down
1 change: 0 additions & 1 deletion docs/en/reference/introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions docs/en/reference/platforms.rst
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,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
Expand Down
10 changes: 5 additions & 5 deletions docs/en/reference/schema-representation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
^^^^^^^^^^^^^^^^^^^^^^^
Expand All @@ -133,8 +133,8 @@ 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.
- **collation** (string): The collation to use for the column. Supported by MySQL, PostgreSQL,
Sqlite, SQL Server and Drizzle.
Sqlite and SQL Server.
- **check** (string): The check constraint clause to add to the column.
Defaults to ``null``.
124 changes: 43 additions & 81 deletions docs/en/reference/types.rst

Large diffs are not rendered by default.

23 changes: 0 additions & 23 deletions lib/Doctrine/DBAL/Driver/DrizzlePDOMySql/Connection.php

This file was deleted.

61 changes: 0 additions & 61 deletions lib/Doctrine/DBAL/Driver/DrizzlePDOMySql/Driver.php

This file was deleted.

2 changes: 0 additions & 2 deletions lib/Doctrine/DBAL/DriverManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,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',
];
Expand Down Expand Up @@ -75,7 +74,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.
Expand Down
Loading