Merge pull request #196 from cakephp/issue-182

Generate isUnique rules for single column unique key indexes.
cakephp · Dec 12, 2015 · 651664a · 651664a
2 parents 567ee14 + 7927edd
commit 651664a
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 1 deletion.
diff --git a/src/Shell/Task/ModelTask.php b/src/Shell/Task/ModelTask.php
@@ -650,7 +650,8 @@ public function getRules($model, array $associations)
         if (!empty($this->params['no-rules'])) {
             return [];
         }
-        $fields = $model->schema()->columns();
+        $schema = $model->schema();
+        $fields = $schema->columns();
         if (empty($fields)) {
             return [];
         }
@@ -661,6 +662,16 @@ public function getRules($model, array $associations)
                 $rules[$fieldName] = ['name' => 'isUnique'];
             }
         }
+        foreach ($schema->constraints() as $name) {
+            $constraint = $schema->constraint($name);
+            if ($constraint['type'] !== SchemaTable::CONSTRAINT_UNIQUE) {
+                continue;
+            }
+            if (count($constraint['columns']) > 1) {
+                continue;
+            }
+            $rules[$constraint['columns'][0]] = ['name' => 'isUnique'];
+        }
 
         if (empty($associations['belongsTo'])) {
             return $rules;

diff --git a/tests/TestCase/Shell/Task/ModelTaskTest.php b/tests/TestCase/Shell/Task/ModelTaskTest.php
@@ -812,6 +812,35 @@ public function testGetRules()
         $this->assertEquals($expected, $result);
     }
 
+    /**
+     * Tests the getRules with unique keys.
+     *
+     * Multi-column constraints are ignored as they would
+     * require a break in compatibility.
+     *
+     * @return void
+     */
+    public function testGetRulesUniqueKeys()
+    {
+        $model = TableRegistry::get('BakeArticles');
+        $model->schema()->addConstraint('unique_title', [
+            'type' => 'unique',
+            'columns' => ['title']
+        ]);
+        $model->schema()->addConstraint('ignored_constraint', [
+            'type' => 'unique',
+            'columns' => ['title', 'bake_user_id']
+        ]);
+
+        $result = $this->Task->getRules($model, []);
+        $expected = [
+            'title' => [
+                'name' => 'isUnique'
+            ],
+        ];
+        $this->assertEquals($expected, $result);
+    }
+
     /**
      * test non interactive doActsAs
      *