Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
doctrine-dbal
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Tomáš Trávníček
doctrine-dbal
Commits
ff112209
Commit
ff112209
authored
May 01, 2008
by
romanb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
minor refactorings & cleanups.
parent
24872ef6
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
11 additions
and
22 deletions
+11
-22
Mapper.php
lib/Doctrine/Mapper.php
+1
-11
Pager.php
lib/Doctrine/Pager.php
+1
-0
Db2.php
lib/Doctrine/Sequence/Db2.php
+1
-1
Firebird.php
lib/Doctrine/Sequence/Firebird.php
+2
-2
Mssql.php
lib/Doctrine/Sequence/Mssql.php
+1
-1
Mysql.php
lib/Doctrine/Sequence/Mysql.php
+1
-1
Oracle.php
lib/Doctrine/Sequence/Oracle.php
+1
-1
Pgsql.php
lib/Doctrine/Sequence/Pgsql.php
+1
-1
Sqlite.php
lib/Doctrine/Sequence/Sqlite.php
+2
-4
No files found.
lib/Doctrine/Mapper.php
View file @
ff112209
...
@@ -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
*
*
...
...
lib/Doctrine/Pager.php
View file @
ff112209
...
@@ -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
{
{
...
...
lib/Doctrine/Sequence/Db2.php
View file @
ff112209
...
@@ -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
*
*
...
...
lib/Doctrine/Sequence/Firebird.php
View file @
ff112209
...
@@ -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
...
...
lib/Doctrine/Sequence/Mssql.php
View file @
ff112209
...
@@ -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
*
*
...
...
lib/Doctrine/Sequence/Mysql.php
View file @
ff112209
...
@@ -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
*
*
...
...
lib/Doctrine/Sequence/Oracle.php
View file @
ff112209
...
@@ -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
*
*
...
...
lib/Doctrine/Sequence/Pgsql.php
View file @
ff112209
...
@@ -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
*
*
...
...
lib/Doctrine/Sequence/Sqlite.php
View file @
ff112209
...
@@ -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
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment