RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-01 04:51:45 +03:00
Code Issues Projects Releases Wiki Activity

Doctrine_Migration::setTableName now takes the ATTR_TBLNAME_FORMAT into account

Browse Source
This commit is contained in:
romanb 2007-11-18 16:42:33 +00:00
parent cfc7d4e423
commit 82432246b9
4 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Doctrine/Migration.php
View File

@ -90,7 +90,8 @@ class Doctrine_Migration
*/ */
public function setTableName($tableName) public function setTableName($tableName)
{ {
$this->_migrationTableName = $tableName; $this->_migrationTableName = Doctrine_Manager::connection()
->formatter->getTableName($tableName);
} }
/** /**

1
lib/Doctrine/Record.php
View File

@ -455,7 +455,6 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
*/ */
public function hydrate(array $data) public function hydrate(array $data)
{ {
$this->_values = array_merge($this->_values, $this->cleanData($data)); $this->_values = array_merge($this->_values, $this->cleanData($data));
$this->_data = array_merge($this->_data, $data); $this->_data = array_merge($this->_data, $data);
//Doctrine::dump($this->_data); //Doctrine::dump($this->_data);

8
lib/Doctrine/Transaction.php
View File

@ -248,18 +248,14 @@ class Doctrine_Transaction extends Doctrine_Connection_Module
} }
$listener->postSavepointCommit($event); $listener->postSavepointCommit($event);
} else { } else {
if ($this->transactionLevel == 1) {
if ($this->transactionLevel == 1) {
if ( ! empty($this->invalid)) { if ( ! empty($this->invalid)) {
$this->rollback(); $this->rollback();
$tmp = $this->invalid; $tmp = $this->invalid;
$this->invalid = array(); $this->invalid = array();
throw new Doctrine_Validator_Exception($tmp); throw new Doctrine_Validator_Exception($tmp);
} }
// take snapshots of all collections used within this transaction // take snapshots of all collections used within this transaction
foreach ($this->_collections as $coll) { foreach ($this->_collections as $coll) {
$coll->takeSnapshot(); $coll->takeSnapshot();

2
tests/ValidatorTestCase.php
View File

@ -216,7 +216,7 @@ class Doctrine_Validator_TestCase extends Doctrine_UnitTestCase
$user->name = "this is an example of too long user name not very good example but an example nevertheless"; $user->name = "this is an example of too long user name not very good example but an example nevertheless";
$user->save(); $user->save();
$this->fail(); $this->fail();
} catch(Doctrine_Validator_Exception $e) { } catch (Doctrine_Validator_Exception $e) {
$this->pass(); $this->pass();
$a = $e->getInvalidRecords(); $a = $e->getInvalidRecords();
//var_dump($a[1]->getErrorStack()); //var_dump($a[1]->getErrorStack());