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

Bugfix: Changed "if( ! $prev[$pointer])" to "if( ! isset($prev[$pointer]) )" in

Browse source 
Query.php line 538.
Change: Changed return value of pessimistic locking releasedAgedLocks to return the number of released locks.
This commit is contained in:
doctrine 2006-06-19 08:04:39 +00:00
parent 1fd421d09e
commit 7b19bef12b
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Doctrine/Locking/Manager/Pessimistic.php
View file

@ -210,7 +210,7 @@ class Doctrine_Locking_Manager_Pessimistic
* When called without parameters all locks older than 15 minutes are released. * When called without parameters all locks older than 15 minutes are released.
* *
* @param integer $age The maximum valid age of locks in seconds * @param integer $age The maximum valid age of locks in seconds
* @return boolean TRUE if locks have been released, FALSE if no locks were released * @return integer The number of locks that have been released
* @throws Doctrine_Locking_Exception If the release process failed due to database errors * @throws Doctrine_Locking_Exception If the release process failed due to database errors
*/ */
public function releaseAgedLocks($age = 900) public function releaseAgedLocks($age = 900)
@ -226,7 +226,7 @@ class Doctrine_Locking_Manager_Pessimistic
$count = $stmt->rowCount(); $count = $stmt->rowCount();
return ($count > 0); return $count;
} }
catch(PDOException $pdoe) catch(PDOException $pdoe)
{ {

2
Doctrine/Query.php
View file

@ -535,7 +535,7 @@ class Doctrine_Query extends Doctrine_Access {
$pointer = $this->joins[$name]; $pointer = $this->joins[$name];
$alias = $this->tables[$pointer]->getAlias($name); $alias = $this->tables[$pointer]->getAlias($name);
$fk = $this->tables[$pointer]->getForeignKey($alias); $fk = $this->tables[$pointer]->getForeignKey($alias);
if( ! $prev[$pointer]) if( ! isset($prev[$pointer]) )
continue; continue;
$last = $prev[$pointer]->getLast(); $last = $prev[$pointer]->getLast();