Skip to content

Fixed a bug in the identity map decorator if no object is found by getRelatedObject() #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
schaumiii wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Fixed a bug in the identity map decorator if no object is found by getRelatedObject() #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7a03c21
fixed bug in identity map decorator if no object is found
schaumiii Nov 27, 2013
8d524a1
added falsely removed @throws documentation
schaumiii Nov 28, 2013
42cc50a
fixed typo in test-fail message
schaumiii Nov 28, 2013
f7b3bdd
adjusted expected id and count of persons to consider the recently ad…
schaumiii Nov 28, 2013
da8156f
ignoring persons which does not have an employer set in fake find query
schaumiii Nov 28, 2013
42a59d4
made require statement independently from include path
schaumiii Nov 28, 2013
6e3c48e
Merge branch 'refs/heads/master' into feat/fixedIdentityMapDecoratorBug
schaumiii Oct 26, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions src/session_decorators/identity.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,6 +684,9 @@ public function getRelatedObjects( $object, $relatedClass, $relationName = null
*
* @throws ezcPersistentRelationNotFoundException
Copy link

@mschirmacher mschirmacher Nov 28, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To remove this comment is wrong -- it still can throw this exception ;-)

* if the given $object does not have a relation to $relatedClass.
*
* @throws ezcPersistentRelatedObjectNotFoundException
* if there is no object of $relatedClass found for $object
*/
public function getRelatedObject( $object, $relatedClass, $relationName = null )
{
Expand All @@ -692,6 +695,14 @@ public function getRelatedObject( $object, $relatedClass, $relationName = null )
$relatedClass,
$relationName
);
if ( empty( $relObjs ) ) {
// no object found, so throw same exception like it is thrown by
// ezcPersistentSession
throw new ezcPersistentRelatedObjectNotFoundException(
$object,
$relatedClass
);
}
return reset( $relObjs );
}

Expand Down
1 change: 1 addition & 0 deletions tests/data/relation_test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ public static function insertData( $db = null )
$db->exec( "INSERT INTO " . $db->quoteIdentifier( "PO_persons" ) . " (" . $db->quoteIdentifier( "firstname" ) . ", " . $db->quoteIdentifier( "surname" ) . ", " . $db->quoteIdentifier( "employer" ) . ") VALUES (" . $db->quote( "Theodor" ) . ", " . $db->quote( "Gopher" ) . ", 2)" );
$db->exec( "INSERT INTO " . $db->quoteIdentifier( "PO_persons" ) . " (" . $db->quoteIdentifier( "firstname" ) . ", " . $db->quoteIdentifier( "surname" ) . ", " . $db->quoteIdentifier( "employer" ) . ") VALUES (" . $db->quote( "Frederick" ) . ", " . $db->quote( "Ajax" ) . ", 1)" );
$db->exec( "INSERT INTO " . $db->quoteIdentifier( "PO_persons" ) . " (" . $db->quoteIdentifier( "firstname" ) . ", " . $db->quoteIdentifier( "surname" ) . ", " . $db->quoteIdentifier( "employer" ) . ") VALUES (" . $db->quote( "Raymond" ) . ", " . $db->quote( "Socialweb" ) . ", 1)" );
$db->exec( "INSERT INTO " . $db->quoteIdentifier( "PO_persons" ) . " (" . $db->quoteIdentifier( "firstname" ) . ", " . $db->quoteIdentifier( "surname" ) . ", " . $db->quoteIdentifier( "employer" ) . ") VALUES (" . $db->quote( "Pete" ) . ", " . $db->quote( "Javascript" ) . ", 0)" );

$db->exec( "INSERT INTO " . $db->quoteIdentifier( "PO_persons_addresses" ) . " ( " . $db->quoteIdentifier( "person_id" ) . ", " . $db->quoteIdentifier( "address_id" ) . ") VALUES ( 1, 1)" );
$db->exec( "INSERT INTO " . $db->quoteIdentifier( "PO_persons_addresses" ) . " ( " . $db->quoteIdentifier( "person_id" ) . ", " . $db->quoteIdentifier( "address_id" ) . ") VALUES ( 1, 2)" );
Expand Down
12 changes: 12 additions & 0 deletions tests/persistent_session_identity_decorator/relation_object_extractor_test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,10 @@ public function testFindOneLevelOneRelationRestrictions()
);

$fakeFind = $this->session->createFindQuery( 'RelationTestPerson' );
// ignore Persons where employer is not set
$fakeFind->where(
$fakeFind->expr->neq('employer', 0)
);
$fakeRes = $this->session->find( $fakeFind );

$this->assertEquals(
Expand Down Expand Up @@ -488,6 +492,10 @@ public function testFindOneLevelMultiRelationRestrictions()
);

$fakeFind = $this->session->createFindQuery( 'RelationTestPerson' );
// ignore Persons where employer is not set
$fakeFind->where(
$fakeFind->expr->neq('employer', 0)
);
$fakeRes = $this->session->find( $fakeFind );

$this->assertEquals(
Expand Down Expand Up @@ -622,6 +630,10 @@ public function testFindMultiLevelSingleRelationRestrictions()
);

$fakeFind = $this->session->createFindQuery( 'RelationTestPerson' );
// ignore Persons where employer is not set
$fakeFind->where(
$fakeFind->expr->neq('employer', 0)
);
$fakeRes = $this->session->find( $fakeFind );

$this->assertEquals(
Expand Down
9 changes: 9 additions & 0 deletions tests/persistent_session_identity_decorator/relation_test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,15 @@ public function testGetRelatedObjectEmployer1Refetch()
$this->assertEquals( $employer1, $employer2 );
}

/**
* @expectedException ezcPersistentRelatedObjectNotFoundException
*/
public function testGetRelatedObjectNotFound()
{
$person = $this->idSession->load( "RelationTestPerson", 4 );
$this->idSession->getRelatedObject( $person, "RelationTestEmployer" );
}

public function testAddRelatedObjectEmployerFailureReverse()
{
$person = $this->idSession->load( "RelationTestPerson", 2 );
Expand Down
10 changes: 5 additions & 5 deletions tests/relations/one_to_many_relation_test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ public function testAddRelatedPersonToEmployer2SaveSuccess()
$this->session->save( $person );

$res = RelationTestPerson::__set_state(array(
'id' => 4,
'id' => 5,
'firstname' => 'Jan',
'surname' => 'Soap',
'employer' => 2,
Expand Down Expand Up @@ -457,14 +457,14 @@ public function testAddRelatedPersonsToEmployer2SaveSuccess()
$res = array(
0 =>
RelationTestPerson::__set_state(array(
'id' => 4,
'id' => 5,
'firstname' => 'Tobias',
'surname' => 'Preprocess',
'employer' => 2,
)),
1 =>
RelationTestPerson::__set_state(array(
'id' => 5,
'id' => 6,
'firstname' => 'Jan',
'surname' => 'Soap',
'employer' => 2,
Expand Down Expand Up @@ -594,9 +594,9 @@ public function testDeleteEmployer2CascadePersonCascadeBirthdaySuccess()
$stmt->execute();

$this->assertEquals(
2,
3,
$stmt->fetchColumn(),
"Persons cascaded from employer not deletec correctly."
"Persons cascaded from employer not deleted correctly."
);
unset( $q, $stmt );

Expand Down