RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-06 00:57:10 +03:00
Code Issues Projects Releases Wiki Activity

minor refactorings & cleanups.

Browse Source
This commit is contained in:
romanb 2008-05-01 09:50:23 +00:00
parent 24872ef65f
commit ff11220961
9 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Doctrine/Mapper.php
View File

@ -354,7 +354,6 @@ class Doctrine_Mapper
return $record; return $record;
} }
$idHash = $this->_conn->unitOfWork->getIdentifierHash($id); $idHash = $this->_conn->unitOfWork->getIdentifierHash($id);
if ($record = $this->_conn->unitOfWork->tryGetByIdHash($idHash, if ($record = $this->_conn->unitOfWork->tryGetByIdHash($idHash,
@ -374,6 +373,7 @@ class Doctrine_Mapper
/** /**
* @param $id database row id * @param $id database row id
* @todo Looks broken. Figure out an implementation and decide whether its needed.
*/ */
final public function getProxy($id = null) final public function getProxy($id = null)
{ {
@ -544,16 +544,6 @@ class Doctrine_Mapper
{ {
return $this->_domainClassName; return $this->_domainClassName;
} }
/**
* returns a string representation of this object
*
* @return string
*/
/*public function __toString()
{
return Doctrine_Lib::getTableAsString($this);
}*/
/** /**
* findBy * findBy

1
lib/Doctrine/Pager.php
View File

@ -30,6 +30,7 @@
* @version $Revision$ * @version $Revision$
* @link www.phpdoctrine.org * @link www.phpdoctrine.org
* @since 0.9 * @since 0.9
* @todo Move the Pager into a separate package ("Doctrine Utilities"? or even a "Doctrine Pager" package?)
*/ */
class Doctrine_Pager class Doctrine_Pager
{ {

2
lib/Doctrine/Sequence/Db2.php
View File

@ -18,7 +18,7 @@
* and is licensed under the LGPL. For more information, see * and is licensed under the LGPL. For more information, see
* <http://www.phpdoctrine.org>. * <http://www.phpdoctrine.org>.
*/ */
Doctrine::autoload('Doctrine_Sequence');
/** /**
* Doctrine_Sequence_Db2 * Doctrine_Sequence_Db2
* *

4
lib/Doctrine/Sequence/Firebird.php
View File

@ -18,7 +18,7 @@
* and is licensed under the LGPL. For more information, see * and is licensed under the LGPL. For more information, see
* <http://www.phpdoctrine.org>. * <http://www.phpdoctrine.org>.
*/ */
Doctrine::autoload('Doctrine_Sequence');
/** /**
* Doctrine_Sequence_Firebird * Doctrine_Sequence_Firebird
* *
@ -33,7 +33,7 @@ Doctrine::autoload('Doctrine_Sequence');
class Doctrine_Sequence_Firebird extends Doctrine_Sequence class Doctrine_Sequence_Firebird extends Doctrine_Sequence
{ {
/** /**
* Returns the next free id of a sequence * Returns the next free id of a sequence.
* *
* @param string $seqName name of the sequence * @param string $seqName name of the sequence
* @param bool when true missing sequences are automatic created * @param bool when true missing sequences are automatic created

2
lib/Doctrine/Sequence/Mssql.php
View File

@ -18,7 +18,7 @@
* and is licensed under the LGPL. For more information, see * and is licensed under the LGPL. For more information, see
* <http://www.phpdoctrine.org>. * <http://www.phpdoctrine.org>.
*/ */
Doctrine::autoload('Doctrine_Sequence');
/** /**
* Doctrine_Sequence_Mssql * Doctrine_Sequence_Mssql
* *

2
lib/Doctrine/Sequence/Mysql.php
View File

@ -18,7 +18,7 @@
* and is licensed under the LGPL. For more information, see * and is licensed under the LGPL. For more information, see
* <http://www.phpdoctrine.org>. * <http://www.phpdoctrine.org>.
*/ */
Doctrine::autoload('Doctrine_Sequence');
/** /**
* Doctrine_Sequence_Mysql * Doctrine_Sequence_Mysql
* *

2
lib/Doctrine/Sequence/Oracle.php
View File

@ -18,7 +18,7 @@
* and is licensed under the LGPL. For more information, see * and is licensed under the LGPL. For more information, see
* <http://www.phpdoctrine.org>. * <http://www.phpdoctrine.org>.
*/ */
Doctrine::autoload('Doctrine_Sequence');
/** /**
* Doctrine_Sequence_Oracle * Doctrine_Sequence_Oracle
* *

2
lib/Doctrine/Sequence/Pgsql.php
View File

@ -18,7 +18,7 @@
* and is licensed under the LGPL. For more information, see * and is licensed under the LGPL. For more information, see
* <http://www.phpdoctrine.org>. * <http://www.phpdoctrine.org>.
*/ */
Doctrine::autoload('Doctrine_Sequence');
/** /**
* Doctrine_Sequence_Pgsql * Doctrine_Sequence_Pgsql
* *

6
lib/Doctrine/Sequence/Sqlite.php
View File

@ -33,7 +33,7 @@
class Doctrine_Sequence_Sqlite extends Doctrine_Sequence class Doctrine_Sequence_Sqlite extends Doctrine_Sequence
{ {
/** /**
* Returns the next free id of a sequence * Returns the next free id of a sequence.
* *
* @param string $seqName name of the sequence * @param string $seqName name of the sequence
* @param bool $onDemand when true missing sequences are automatic created * @param bool $onDemand when true missing sequences are automatic created
@ -48,9 +48,7 @@ class Doctrine_Sequence_Sqlite extends Doctrine_Sequence
$query = 'INSERT INTO ' . $sequenceName . ' (' . $seqcolName . ') VALUES (NULL)'; $query = 'INSERT INTO ' . $sequenceName . ' (' . $seqcolName . ') VALUES (NULL)';
try { try {
$this->conn->exec($query);
$num = $this->conn->exec($query);
} catch (Doctrine_Connection_Exception $e) { } catch (Doctrine_Connection_Exception $e) {
if ($onDemand && $e->getPortableCode() == Doctrine::ERR_NOSUCHTABLE) { if ($onDemand && $e->getPortableCode() == Doctrine::ERR_NOSUCHTABLE) {
try { try {