Skip to content

Commit

Permalink
[DBAL-243] Remove Connection#setCharset()
Browse files Browse the repository at this point in the history
  • Loading branch information
beberlei committed Jul 5, 2012
1 parent 7beb634 commit ab57a01
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 24 deletions.
15 changes: 15 additions & 0 deletions UPGRADE
@@ -1,5 +1,20 @@
# Upgrade to 2.3

## Doctrine\DBAL\Connection#setCharsetSQL() removed

This method only worked on MySQL and it is considered unsafe on MySQL to use SET NAMES UTF-8 instead
of setting the charset directly on connection already. Replace this behavior with the
connection charset option:

Before:

$conn = DriverManager::getConnection(array(..));
$conn->setCharset('UTF8');

After:

$conn = DriverManager::getConnection(array('charset' => 'UTF8', ..));

## Doctrine\DBAL\Schema\Table#renameColumn() removed

Doctrine\DBAL\Schema\Table#renameColumn() was removed, because it drops and recreates
Expand Down
10 changes: 0 additions & 10 deletions lib/Doctrine/DBAL/Connection.php
Expand Up @@ -539,16 +539,6 @@ public function insert($tableName, array $data, array $types = array())
return $this->executeUpdate($query, array_values($data), $types);
}

/**
* Sets the given charset on the current connection.
*
* @param string $charset The charset to set.
*/
public function setCharset($charset)
{
$this->executeUpdate($this->_platform->getSetCharsetSQL($charset));
}

/**
* Quote a string so it can be safely used as a table or column name, even if
* it is a reserved name.
Expand Down
14 changes: 0 additions & 14 deletions lib/Doctrine/DBAL/Platforms/AbstractPlatform.php
Expand Up @@ -2092,20 +2092,6 @@ public function convertBooleans($item)
return $item;
}

/**
* Gets the SQL statement specific for the platform to set the charset.
*
* This function is MySQL specific and required by
* {@see \Doctrine\DBAL\Connection::setCharset($charset)}
*
* @param string $charset
* @return string
*/
public function getSetCharsetSQL($charset)
{
return "SET NAMES '".$charset."'";
}

/**
* Gets the SQL specific for the platform to get the current date.
*
Expand Down

0 comments on commit ab57a01

Please sign in to comment.