RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 05:13:37 +03:00
Code Issues Projects Releases Wiki Activity

Small refactorings

Browse source
This commit is contained in:
zYne 2006-09-20 11:29:35 +00:00
parent 9b951928be
commit 419daa8114
2 changed files with 21 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
Doctrine/Connection.php
View file

@ -204,6 +204,9 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun
return count($this->tables); return count($this->tables);
} }
/** /**
* addTable
* adds a Doctrine_Table object into connection registry
*
* @param $objTable a Doctrine_Table object to be added into registry * @param $objTable a Doctrine_Table object to be added into registry
* @return boolean * @return boolean
*/ */
@ -217,6 +220,7 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun
return true; return true;
} }
/** /**
* create
* creates a record * creates a record
* *
* create creates a record * create creates a record
@ -240,7 +244,7 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun
} }
/** /**
* saveAll * saveAll
* saves all the records from all tables * persists all the records from all tables
* *
* @return void * @return void
*/ */
@ -274,6 +278,9 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun
} }
} }
/** /**
* evictTables
* evicts all tables
*
* @return void * @return void
*/ */
public function evictTables() { public function evictTables() {
@ -424,16 +431,10 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun
$foreign = $fk->getForeign(); $foreign = $fk->getForeign();
if($record->getTable()->hasPrimaryKey($fk->getLocal())) { if($record->getTable()->hasPrimaryKey($fk->getLocal())) {
switch($record->getState()): if( ! $record->exists())
case Doctrine_Record::STATE_TDIRTY: $saveLater[$k] = $fk;
case Doctrine_Record::STATE_TCLEAN: else
$saveLater[$k] = $fk; $v->save();
break;
case Doctrine_Record::STATE_CLEAN:
case Doctrine_Record::STATE_DIRTY:
$v->save();
break;
endswitch;
} else { } else {
// ONE-TO-ONE relationship // ONE-TO-ONE relationship
$obj = $record->get($fk->getTable()->getComponentName()); $obj = $record->get($fk->getTable()->getComponentName());
@ -552,21 +553,16 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun
* @return boolean true on success, false on failure * @return boolean true on success, false on failure
*/ */
final public function delete(Doctrine_Record $record) { final public function delete(Doctrine_Record $record) {
switch($record->getState()): if( ! $record->exists())
case Doctrine_Record::STATE_PROXY: return false;
case Doctrine_Record::STATE_CLEAN:
case Doctrine_Record::STATE_DIRTY: $this->beginTransaction();
$this->beginTransaction();
$this->deleteComposites($record); $this->deleteComposites($record);
$this->transaction->addDelete($record); $this->transaction->addDelete($record);
$this->commit(); $this->commit();
return true; return true;
break;
default:
return false;
endswitch;
} }
/** /**
* returns a string representation of this object * returns a string representation of this object

2
Doctrine/Connection/UnitOfWork.php
View file

@ -20,7 +20,7 @@
*/ */
/** /**
* Doctrine_Transaction * Doctrine_Connection_UnitOfWork
* *
* @package Doctrine ORM * @package Doctrine ORM
* @url www.phpdoctrine.com * @url www.phpdoctrine.com