Commit ff112209 authored by romanb's avatar romanb

minor refactorings & cleanups.

parent 24872ef6
...@@ -354,7 +354,6 @@ class Doctrine_Mapper ...@@ -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 ...@@ -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)
{ {
...@@ -545,16 +545,6 @@ class Doctrine_Mapper ...@@ -545,16 +545,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
* *
......
...@@ -30,6 +30,7 @@ ...@@ -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
{ {
......
...@@ -18,7 +18,7 @@ ...@@ -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
* *
......
...@@ -18,7 +18,7 @@ ...@@ -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'); ...@@ -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
......
...@@ -18,7 +18,7 @@ ...@@ -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
* *
......
...@@ -18,7 +18,7 @@ ...@@ -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
* *
......
...@@ -18,7 +18,7 @@ ...@@ -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
* *
......
...@@ -18,7 +18,7 @@ ...@@ -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
* *
......
...@@ -33,7 +33,7 @@ ...@@ -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 ...@@ -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 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment