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
82432246
Commit
82432246
authored
Nov 18, 2007
by
romanb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Doctrine_Migration::setTableName now takes the ATTR_TBLNAME_FORMAT into account
parent
cfc7d4e4
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
9 deletions
+5
-9
Migration.php
lib/Doctrine/Migration.php
+2
-1
Record.php
lib/Doctrine/Record.php
+0
-1
Transaction.php
lib/Doctrine/Transaction.php
+2
-6
ValidatorTestCase.php
tests/ValidatorTestCase.php
+1
-1
No files found.
lib/Doctrine/Migration.php
View file @
82432246
...
...
@@ -90,7 +90,8 @@ class Doctrine_Migration
*/
public
function
setTableName
(
$tableName
)
{
$this
->
_migrationTableName
=
$tableName
;
$this
->
_migrationTableName
=
Doctrine_Manager
::
connection
()
->
formatter
->
getTableName
(
$tableName
);
}
/**
...
...
lib/Doctrine/Record.php
View file @
82432246
...
...
@@ -455,7 +455,6 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
*/
public
function
hydrate
(
array
$data
)
{
$this
->
_values
=
array_merge
(
$this
->
_values
,
$this
->
cleanData
(
$data
));
$this
->
_data
=
array_merge
(
$this
->
_data
,
$data
);
//Doctrine::dump($this->_data);
...
...
lib/Doctrine/Transaction.php
View file @
82432246
...
...
@@ -248,18 +248,14 @@ class Doctrine_Transaction extends Doctrine_Connection_Module
}
$listener
->
postSavepointCommit
(
$event
);
}
else
{
if
(
$this
->
transactionLevel
==
1
)
{
}
else
{
if
(
$this
->
transactionLevel
==
1
)
{
if
(
!
empty
(
$this
->
invalid
))
{
$this
->
rollback
();
$tmp
=
$this
->
invalid
;
$this
->
invalid
=
array
();
throw
new
Doctrine_Validator_Exception
(
$tmp
);
}
// take snapshots of all collections used within this transaction
foreach
(
$this
->
_collections
as
$coll
)
{
$coll
->
takeSnapshot
();
...
...
tests/ValidatorTestCase.php
View file @
82432246
...
...
@@ -216,7 +216,7 @@ class Doctrine_Validator_TestCase extends Doctrine_UnitTestCase
$user
->
name
=
"this is an example of too long user name not very good example but an example nevertheless"
;
$user
->
save
();
$this
->
fail
();
}
catch
(
Doctrine_Validator_Exception
$e
)
{
}
catch
(
Doctrine_Validator_Exception
$e
)
{
$this
->
pass
();
$a
=
$e
->
getInvalidRecords
();
//var_dump($a[1]->getErrorStack());
...
...
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