Fixing isUnique and extistsIn rules when updating entities

src/ORM/Rule/ExistsIn.php

@@ -61,6 +61,10 @@ public function __invoke(EntityInterface $entity, array $options) {
 			$this->_repository = $options['repository']->association($this->_repository);
 		}
 
+		if (!$entity->extract($this->_fields, true)) {
+			return true;
+		}
+
 		$conditions = array_combine(
 			(array)$this->_repository->primaryKey(),
 			$entity->extract($this->_fields)

src/ORM/Rule/IsUnique.php

@@ -46,6 +46,10 @@ public function __construct(array $fields) {
  * @return bool
  */
 	public function __invoke(EntityInterface $entity, array $options) {
+		if (!$entity->extract($this->_fields, true)) {
+			return true;
+		}
+
 		$conditions = $entity->extract($this->_fields);
 		if ($entity->isNew() === false) {
 			$keys = (array)$options['repository']->primaryKey();

tests/TestCase/ORM/RulesCheckerIntegrationTest.php

@@ -451,4 +451,42 @@ public function testUseBuildRulesEvent() {
 		$this->assertFalse($table->save($entity));
 	}
 
+/**
+ * Tests isUnique with untouched fields
+ *
+ * @group save
+ * @return void
+ */
+	public function testIsUniqueWithCleanFields() {
+		$table = TableRegistry::get('Articles');
+		$entity = $table->get(1);
+		$rules = $table->rulesChecker();
+		$rules->add($rules->isUnique(['title', 'author_id'], 'Nope'));
+
+		$entity->body = 'Foo';
+		$this->assertSame($entity, $table->save($entity));
+
+		$entity->title = 'Third Article';
+		$this->assertFalse($table->save($entity));
+	}
+
+/**
+ * Tests the existsIn rule when passing non dirty fields
+ *
+ * @group save
+ * @return void
+ */
+	public function testExistsInWithCleanFields() {
+		$table = TableRegistry::get('Articles');
+		$table->belongsTo('Authors');
+		$rules = $table->rulesChecker();
+		$rules->add($rules->existsIn('author_id', 'Authors'));
+
+		$entity = $table->get(1);
+		$entity->title = 'Foo';
+		$entity->author_id = 1000;
+		$entity->dirty('author_id', false);
+		$this->assertSame($entity, $table->save($entity));
+	}
+
 }