Restoring primary key validation

cakephp · May 18, 2014 · ad3f08a · ad3f08a
1 parent cee14ac
commit ad3f08a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/Console/Command/Task/ModelTask.php b/src/Console/Command/Task/ModelTask.php
@@ -411,7 +411,7 @@ public function getValidation($model) {
  * @return array Array of validation for the field.
  */
 	public function fieldValidation($fieldName, array $metaData, $primaryKey) {
-		$ignoreFields = array_merge($primaryKey, ['created', 'modified', 'updated']);
+		$ignoreFields = ['created', 'modified', 'updated'];
 		if (in_array($fieldName, $ignoreFields)) {
 			return false;
 		}

diff --git a/tests/TestCase/Console/Command/Task/ModelTaskTest.php b/tests/TestCase/Console/Command/Task/ModelTaskTest.php
@@ -427,6 +427,7 @@ public function testGetValidation() {
 			'title' => ['rule' => false, 'allowEmpty' => false],
 			'body' => ['rule' => false, 'allowEmpty' => true],
 			'published' => ['rule' => 'boolean', 'allowEmpty' => true],
+			'id' => ['rule' => 'numeric', 'allowEmpty' => 'create']
 		];
 		$this->assertEquals($expected, $result);
 
@@ -436,7 +437,8 @@ public function testGetValidation() {
 			'bake_article_id' => ['rule' => 'numeric', 'allowEmpty' => false],
 			'bake_user_id' => ['rule' => 'numeric', 'allowEmpty' => false],
 			'comment' => ['rule' => false, 'allowEmpty' => true],
-			'published' => ['rule' => false,'allowEmpty' => true]
+			'published' => ['rule' => false,'allowEmpty' => true],
+			'otherid' => ['rule' => 'numeric', 'allowEmpty' => 'create']
 		];
 		$this->assertEquals($expected, $result);
 	}