Don't save entities that haven't changed since last time they were

persisted
cakephp · Nov 29, 2013 · cdd24b9 · cdd24b9
1 parent 8fd6998
commit cdd24b9
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/Cake/ORM/Table.php b/Cake/ORM/Table.php
@@ -923,6 +923,11 @@ public function save(Entity $entity, array $options = []) {
 			'validate' => true,
 			'associated' => true
 		]);
+
+		if ($entity->isNew() === false && !$entity->dirty()) {
+			return $entity;
+		}
+
 		if ($options['atomic']) {
 			$connection = $this->connection();
 			$success = $connection->transactional(function() use ($entity, $options) {

diff --git a/Cake/Test/TestCase/ORM/EntityTest.php b/Cake/Test/TestCase/ORM/EntityTest.php
@@ -475,7 +475,7 @@ public function testDirty() {
 		$entity->dirty('author_id', false);
 		$this->assertFalse($entity->dirty());
 	}
-
+	
 /**
  * Tests dirty() when altering properties values and adding new ones
  *

diff --git a/Cake/Test/TestCase/ORM/TableTest.php b/Cake/Test/TestCase/ORM/TableTest.php
@@ -2418,4 +2418,20 @@ public function testSaveBelongsToWithValidationErrorInJointEntityNonAtomic() {
 		$this->assertEquals(5, $entity->tags[1]->extraInfo->tag_id);
 	}
 
+/**
+ * Tests that saving a persisted and clean entity will is a no-op
+ *
+ * @group save
+ * @return void
+ */
+	public function testSaveCleanEntity() {
+		$table = $this->getMock('\Cake\ORM\Table', ['_processSave']);
+		$entity = new \Cake\ORM\Entity(
+			['id' => 'foo'],
+			['markNew' => false, 'markClean' => true]
+		);
+		$table->expects($this->never())->method('_processSave');
+		$this->assertSame($entity, $table->save($entity));
+	}
+
 }