Browse Source

removed support for unlinkAll() from elasticsearch

feature is not reliable

fixes #5136
tags/2.0.0-rc
Carsten Brandt 10 years ago
parent
commit
982a27db83
  1. 11
      extensions/elasticsearch/ActiveRecord.php
  2. 1
      extensions/elasticsearch/CHANGELOG.md
  3. 44
      tests/unit/extensions/elasticsearch/ActiveRecordTest.php

11
extensions/elasticsearch/ActiveRecord.php

@ -10,6 +10,7 @@ namespace yii\elasticsearch;
use Yii;
use yii\base\InvalidCallException;
use yii\base\InvalidConfigException;
use yii\base\NotSupportedException;
use yii\db\BaseActiveRecord;
use yii\helpers\ArrayHelper;
use yii\helpers\Inflector;
@ -604,4 +605,14 @@ class ActiveRecord extends BaseActiveRecord
return $n;
}
/**
* Destroys the relationship in current model.
*
* This method is not supported by elasticsearch.
*/
public function unlinkAll($name, $delete = false)
{
throw new NotSupportedException('unlinkAll() is not supported by elasticsearch, use unlink() instead.');
}
}

1
extensions/elasticsearch/CHANGELOG.md

@ -6,7 +6,6 @@ Yii Framework 2 elasticsearch extension Change Log
- Bug #3587: Fixed an issue with storing empty records (cebe)
- Bug #4187: Elasticsearch dynamic scripting is disabled in 1.2.0, so do not use it in query builder (cebe)
- Enh #3520: Added `unlinkAll()`-method to active record to remove all records of a model relation (NmDimas, samdark, cebe)
- Enh #3527: Added `highlight` property to Query and ActiveRecord. (Borales)
- Enh #4048: Added `init` event to `ActiveQuery` classes (qiangxue)
- Enh #4086: changedAttributes of afterSave Event now contain old values (dizews)

44
tests/unit/extensions/elasticsearch/ActiveRecordTest.php

@ -804,6 +804,9 @@ class ActiveRecordTest extends ElasticSearchTestCase
$this->assertFalse(isset($items[2]));
}
/**
* @expectedException \yii\base\NotSupportedException
*/
public function testArrayAttributeRelationUnLinkAll()
{
/* @var $order Order */
@ -825,14 +828,51 @@ class ActiveRecordTest extends ElasticSearchTestCase
$this->assertEquals(0, count($items));
}
public function testUnlinkAll()
{
// not supported by elasticsearch
}
/**
* @expectedException \yii\base\NotSupportedException
*/
public function testUnlinkAllAndConditionSetNull()
{
$this->markTestSkipped('https://github.com/yiisoft/yii2/issues/5136');
/* @var $customerClass \yii\db\BaseActiveRecord */
$customerClass = $this->getCustomerClass();
/* @var $orderClass \yii\db\BaseActiveRecord */
$orderClass = $this->getOrderWithNullFKClass();
// in this test all orders are owned by customer 1
$orderClass::updateAll(['customer_id' => 1]);
$this->afterSave();
$customer = $customerClass::findOne(1);
$this->assertEquals(3, count($customer->ordersWithNullFK));
$this->assertEquals(1, count($customer->expensiveOrdersWithNullFK));
$this->assertEquals(3, $orderClass::find()->count());
$customer->unlinkAll('expensiveOrdersWithNullFK');
}
/**
* @expectedException \yii\base\NotSupportedException
*/
public function testUnlinkAllAndConditionDelete()
{
$this->markTestSkipped('https://github.com/yiisoft/yii2/issues/5136');
/* @var $customerClass \yii\db\BaseActiveRecord */
$customerClass = $this->getCustomerClass();
/* @var $orderClass \yii\db\BaseActiveRecord */
$orderClass = $this->getOrderWithNullFKClass();
// in this test all orders are owned by customer 1
$orderClass::updateAll(['customer_id' => 1]);
$this->afterSave();
$customer = $customerClass::findOne(1);
$this->assertEquals(3, count($customer->ordersWithNullFK));
$this->assertEquals(1, count($customer->expensiveOrdersWithNullFK));
$this->assertEquals(3, $orderClass::find()->count());
$customer->unlinkAll('expensiveOrdersWithNullFK', true);
}
// TODO test AR with not mapped PK

Loading…
Cancel
Save