Doctrine_Migration::setTableName now takes the ATTR_TBLNAME_FORMAT into account
This commit is contained in:
parent
cfc7d4e423
commit
82432246b9
@ -90,7 +90,8 @@ class Doctrine_Migration
|
||||
*/
|
||||
public function setTableName($tableName)
|
||||
{
|
||||
$this->_migrationTableName = $tableName;
|
||||
$this->_migrationTableName = Doctrine_Manager::connection()
|
||||
->formatter->getTableName($tableName);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -455,7 +455,6 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
|
||||
*/
|
||||
public function hydrate(array $data)
|
||||
{
|
||||
|
||||
$this->_values = array_merge($this->_values, $this->cleanData($data));
|
||||
$this->_data = array_merge($this->_data, $data);
|
||||
//Doctrine::dump($this->_data);
|
||||
|
@ -249,17 +249,13 @@ class Doctrine_Transaction extends Doctrine_Connection_Module
|
||||
|
||||
$listener->postSavepointCommit($event);
|
||||
} else {
|
||||
|
||||
if ($this->transactionLevel == 1) {
|
||||
if ( ! empty($this->invalid)) {
|
||||
$this->rollback();
|
||||
|
||||
$tmp = $this->invalid;
|
||||
$this->invalid = array();
|
||||
|
||||
throw new Doctrine_Validator_Exception($tmp);
|
||||
}
|
||||
|
||||
// take snapshots of all collections used within this transaction
|
||||
foreach ($this->_collections as $coll) {
|
||||
$coll->takeSnapshot();
|
||||
|
Loading…
x
Reference in New Issue
Block a user