这是indexloc提供的服务，不要输入任何密码
Skip to content

Implemented ignoreRelations setting (try #2) #54

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

Closed
wants to merge 2 commits into from
Closed

Implemented ignoreRelations setting (try #2) #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d6f0eb
Implemented ignoreRelations setting.
Feb 3, 2015
8031893
Implemented ignoreRelations setting + fixed Yii import in test.
Feb 3, 2015
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
15 changes: 12 additions & 3 deletions EActiveRecordRelationBehavior.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
*
* Limitations:
* - currently does not support composite primary keys
* - currently handles all existing relations, will add support for limitation shortly
* - relations defined with 'through' are not supported yet (http://www.yiiframework.com/doc/guide/1.1/en/database.arr#relational-query-with-through)
*
* @property CActiveRecord $owner The owner AR that this behavior is attached to.
Expand All @@ -37,6 +36,11 @@ class EActiveRecordRelationBehavior extends CActiveRecordBehavior
* run inside your transaction without touching it.
*/
public $useTransaction=true;
/**
* @var array allows to configure which relations should be ignored by default
* This option will only be considered when withRelations() or withoutRelations() is not used
*/
public $ignoreRelations=array();
/**
* @var CDbTransaction
*/
Expand All @@ -46,7 +50,6 @@ class EActiveRecordRelationBehavior extends CActiveRecordBehavior
*/
protected $_enabledRelations;


/**
* @return CDbTransaction The transaction that is used while updating the database.
* @see useTransaction
Expand Down Expand Up @@ -470,8 +473,14 @@ public function withoutRelations()
protected function getRelations()
{
if (is_null($this->_enabledRelations))
{
if (count($this->ignoreRelations) > 0)
{
$diff = array_combine($this->ignoreRelations, $this->ignoreRelations);
return array_diff_key($this->owner->relations(), $diff);
}
return $this->owner->relations();

}
return array_intersect_key($this->owner->relations(), array_flip($this->_enabledRelations));
}
}
Expand Down
148 changes: 147 additions & 1 deletion EActiveRecordRelationBehaviorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -736,6 +736,145 @@ public function testGetSetTransaction()
$this->assertInstanceOf('CDbTransaction', $transaction);
$this->assertSame($transaction, $behavior->getTransaction());
}

/**
* tests if withRelations() words correctly
*
* @dataProvider fkConfigurationProvider
*/
public function testSaveWithRelations($config, $transactional)
{
$this->setConfig($config);
$this->startTransaction($transactional);

// create test data
// -- user
$jane = $this->getJane(10, true);
// -- profile
$profile = new Profile();
$profile->disableOwnerRule = true;
$profile->photo = "Jane's Photo";
$profile->website = "jane.doe.com";
$profile->save();
// -- posts
$posts = $this->getPosts(10);

// set profile and posts for jane
$jane->profile = $profile;
$jane->posts = $posts;

// save posts only
$jane->withRelations('posts')->save();
$jane->refresh();

$this->assertNull($jane->profile);
$this->assertEquals(9, count($jane->posts));

// set profile and posts for jane again
$jane->profile = $profile;
$jane->posts = $posts;

// save posts and profile
$jane->withRelations('posts', 'profile')->save();
$jane->refresh();

$this->assertEquals(9, count($jane->posts));
$this->assertEquals("jane.doe.com", $jane->profile->website);

$this->endTransaction($transactional);
}

/**
* tests if withoutRelations() words correctly
*
* @dataProvider fkConfigurationProvider
*/
public function testSaveWithoutRelations($config, $transactional)
{
$this->setConfig($config);
$this->startTransaction($transactional);

// create test data
// -- user
$jane = $this->getJane(10, true);
// -- profile#1
$profile1 = new Profile();
$profile1->disableOwnerRule = true;
$profile1->photo = "Jane's Photo";
$profile1->website = "jane.doe.com";
$profile1->save();
// -- profile#2
$profile2 = new Profile();
$profile2->disableOwnerRule = true;
$profile2->photo = "Jane's Photo";
$profile2->website = "jane.doe.io";
$profile2->save();
// -- posts
$posts = $this->getPosts(10);

// set profile and posts for jane
$jane->profile = $profile1;
$jane->posts = $posts;

// save profile only
$jane->withoutRelations('posts')->save();
$jane->refresh();

$this->assertEquals(0, count($jane->posts));
$this->assertEquals("jane.doe.com", $jane->profile->website);

// set profile and posts for jane again
$jane->profile = $profile2;
$jane->posts = $posts;

// save posts only
$jane->withoutRelations('profile')->save();
$jane->refresh();

$this->assertEquals(9, count($jane->posts));
$this->assertEquals("jane.doe.com", $jane->profile->website);

$this->endTransaction($transactional);
}

/**
* tests if setting ignoreRelations works as expected
*
* @dataProvider fkConfigurationProvider
*/
public function testIgnoreRelations($config, $transactional)
{
$this->setConfig($config);
$this->startTransaction($transactional);

// set ignore relations for user
User::$ignoreRelations = array('profile');

// create test data
// -- user
$jane = $this->getJane(10, true);
// -- profile
$profile = new Profile();
$profile->disableOwnerRule = true;
$profile->photo = "Jane's Photo";
$profile->website = "jane.doe.com";
$profile->save();
// -- posts
$posts = $this->getPosts(10);

// set profile and posts for jane
$jane->profile = $profile;
$jane->posts = $posts;

// save profile only
$jane->save();
$jane->refresh();

$this->assertEquals(9, count($jane->posts));
$this->assertNull($jane->profile);

$this->endTransaction($transactional);
}

/**
* @param \CActiveRecord $ar
Expand Down Expand Up @@ -902,6 +1041,7 @@ class Profile extends \CActiveRecord
{
public static $configurationType='normal';
public $disableOwnerRule=false;
public $eActiveRecordRelationBehavior_ignoreRelations=array();
/**
* Returns the static model of the specified AR class.
* @param string $className active record class name.
Expand Down Expand Up @@ -975,6 +1115,7 @@ public function relations()
class User extends \CActiveRecord
{
public static $configurationType='normal';
public static $ignoreRelations=array();
/**
* Returns the static model of the specified AR class.
* @param string $className active record class name.
Expand All @@ -998,7 +1139,12 @@ public function tableName()
*/
public function behaviors()
{
return array('activeRecordRelationBehavior'=>'EActiveRecordRelationBehavior');
return array(
'activeRecordRelationBehavior'=>array(
'class'=>'EActiveRecordRelationBehavior',
'ignoreRelations'=>self::$ignoreRelations,
)
);
}

/**
Expand Down