Merge pull request #447 from dmromanov/feature/validator-non-negative

Validation for unsigned integer columns
cakephp · Aug 21, 2018 · 7356656 · 7356656
2 parents 3c7c701 + 84aff09
commit 7356656
Show file tree

Hide file tree

Showing 14 changed files with 649 additions and 6 deletions.
diff --git a/src/Shell/Task/ModelTask.php b/src/Shell/Task/ModelTask.php
@@ -21,6 +21,7 @@
 use Cake\ORM\Table;
 use Cake\ORM\TableRegistry;
 use Cake\Utility\Inflector;
+use Cake\Validation\Validation;
 
 /**
  * Task class for generating model files.
@@ -707,11 +708,25 @@ public function fieldValidation($schema, $fieldName, array $metaData, $primaryKe
         } elseif ($metaData['type'] === 'uuid') {
             $rules['uuid'] = [];
         } elseif ($metaData['type'] === 'integer') {
-            $rules['integer'] = [];
+            if ($metaData['unsigned']) {
+                $rules['nonNegativeInteger'] = [];
+            } else {
+                $rules['integer'] = [];
+            }
         } elseif ($metaData['type'] === 'float') {
             $rules['numeric'] = [];
+            if ($metaData['unsigned']) {
+                $rules['greaterThanOrEqual'] = [
+                    0
+                ];
+            }
         } elseif ($metaData['type'] === 'decimal') {
             $rules['decimal'] = [];
+            if ($metaData['unsigned']) {
+                $rules['greaterThanOrEqual'] = [
+                    0
+                ];
+            }
         } elseif ($metaData['type'] === 'boolean') {
             $rules['boolean'] = [];
         } elseif ($metaData['type'] === 'date') {

diff --git a/tests/Fixture/BakeArticlesFixture.php b/tests/Fixture/BakeArticlesFixture.php
@@ -32,6 +32,8 @@ class BakeArticlesFixture extends TestFixture
         'bake_user_id' => ['type' => 'integer', 'null' => false],
         'title' => ['type' => 'string', 'length' => 50, 'null' => false],
         'body' => 'text',
+        'rating' => ['type' => 'float', 'unsigned' => true, 'default' => 0.0, 'null' => false],
+        'score' => ['type' => 'decimal', 'unsigned' => true, 'default' => 0.0, 'null' => false],
         'published' => ['type' => 'boolean', 'length' => 1, 'default' => false],
         'created' => 'datetime',
         'updated' => 'datetime',

diff --git a/tests/Fixture/CategoryThreadsFixture.php b/tests/Fixture/CategoryThreadsFixture.php
@@ -31,8 +31,8 @@ class CategoryThreadsFixture extends TestFixture
         'id' => ['type' => 'integer'],
         'parent_id' => ['type' => 'integer'],
         'name' => ['type' => 'string', 'null' => false],
-        'lft' => ['type' => 'integer'],
-        'rght' => ['type' => 'integer'],
+        'lft' => ['type' => 'integer', 'unsigned' => true],
+        'rght' => ['type' => 'integer', 'unsigned' => true],
         'created' => 'datetime',
         'updated' => 'datetime',
         '_constraints' => ['primary' => ['type' => 'primary', 'columns' => ['id']]]

diff --git a/tests/Fixture/NumberTreesFixture.php b/tests/Fixture/NumberTreesFixture.php
@@ -33,9 +33,9 @@ class NumberTreesFixture extends TestFixture
         'id' => ['type' => 'integer'],
         'name' => ['type' => 'string', 'length' => 50, 'null' => false],
         'parent_id' => 'integer',
-        'lft' => ['type' => 'integer'],
-        'rght' => ['type' => 'integer'],
-        'depth' => ['type' => 'integer'],
+        'lft' => ['type' => 'integer', 'unsigned' => true],
+        'rght' => ['type' => 'integer', 'unsigned' => true],
+        'depth' => ['type' => 'integer', 'unsigned' => true],
         '_constraints' => ['primary' => ['type' => 'primary', 'columns' => ['id']]]
     ];
 

diff --git a/tests/TestCase/Shell/Task/ModelTaskAssociationDetectionTest.php b/tests/TestCase/Shell/Task/ModelTaskAssociationDetectionTest.php
@@ -18,6 +18,11 @@
 use Bake\Test\TestCase\TestCase;
 use Cake\Core\Configure;
 use Cake\Core\Plugin;
+use Cake\Database\Driver\Mysql;
+use Cake\Database\Driver\Postgres;
+use Cake\Database\Driver\Sqlite;
+use Cake\Database\Driver\Sqlserver;
+use Cake\Datasource\ConnectionManager;
 use Cake\ORM\TableRegistry;
 
 /**
@@ -146,6 +151,22 @@ protected function _compareBakeTableResult($name, $comparisonFile)
      */
     public function testBakeAssociationDetectionCategoriesTable()
     {
+        $driver = ConnectionManager::get('test')->getDriver();
+        $this->skipIf($driver instanceof Mysql, 'Incompatible with mysql');
+        $this->_compareBakeTableResult('Categories', __FUNCTION__);
+    }
+
+    /**
+     * test checking if associations where built correctly for categories.
+     *
+     * @return void
+     */
+    public function testBakeAssociationDetectionCategoriesTableSigned()
+    {
+        $driver = ConnectionManager::get('test')->getDriver();
+        $this->skipIf($driver instanceof Sqlite, 'Incompatible with sqlite');
+        $this->skipIf($driver instanceof Postgres, 'Incompatible with postgres');
+        $this->skipIf($driver instanceof Sqlserver, 'Incompatible with sqlserver');
         $this->_compareBakeTableResult('Categories', __FUNCTION__);
     }
 
@@ -166,6 +187,22 @@ public function testBakeAssociationDetectionCategoriesProductsTable()
      */
     public function testBakeAssociationDetectionOldProductsTable()
     {
+        $driver = ConnectionManager::get('test')->getDriver();
+        $this->skipIf($driver instanceof Mysql, 'Incompatible with mysql');
+        $this->_compareBakeTableResult('OldProducts', __FUNCTION__);
+    }
+
+    /**
+     * test checking if associations where built correctly for old_products.
+     *
+     * @return void
+     */
+    public function testBakeAssociationDetectionOldProductsTableSigned()
+    {
+        $driver = ConnectionManager::get('test')->getDriver();
+        $this->skipIf($driver instanceof Sqlite, 'Incompatible with sqlite');
+        $this->skipIf($driver instanceof Postgres, 'Incompatible with postgres');
+        $this->skipIf($driver instanceof Sqlserver, 'Incompatible with sqlserver');
         $this->_compareBakeTableResult('OldProducts', __FUNCTION__);
     }
 
@@ -176,6 +213,22 @@ public function testBakeAssociationDetectionOldProductsTable()
      */
     public function testBakeAssociationDetectionProductVersionsTable()
     {
+        $driver = ConnectionManager::get('test')->getDriver();
+        $this->skipIf($driver instanceof Mysql, 'Incompatible with mysql');
+        $this->_compareBakeTableResult('ProductVersions', __FUNCTION__);
+    }
+
+    /**
+     * test checking if associations where built correctly for product_versions.
+     *
+     * @return void
+     */
+    public function testBakeAssociationDetectionProductVersionsTableSigned()
+    {
+        $driver = ConnectionManager::get('test')->getDriver();
+        $this->skipIf($driver instanceof Sqlite, 'Incompatible with sqlite');
+        $this->skipIf($driver instanceof Postgres, 'Incompatible with postgres');
+        $this->skipIf($driver instanceof Sqlserver, 'Incompatible with sqlserver');
         $this->_compareBakeTableResult('ProductVersions', __FUNCTION__);
     }
 
@@ -186,6 +239,22 @@ public function testBakeAssociationDetectionProductVersionsTable()
      */
     public function testBakeAssociationDetectionProductsTable()
     {
+        $driver = ConnectionManager::get('test')->getDriver();
+        $this->skipIf($driver instanceof Mysql, 'Incompatible with mysql');
+        $this->_compareBakeTableResult('Products', __FUNCTION__);
+    }
+
+    /**
+     * test checking if associations where built correctly for products.
+     *
+     * @return void
+     */
+    public function testBakeAssociationDetectionProductsTableSigned()
+    {
+        $driver = ConnectionManager::get('test')->getDriver();
+        $this->skipIf($driver instanceof Sqlite, 'Incompatible with sqlite');
+        $this->skipIf($driver instanceof Postgres, 'Incompatible with postgres');
+        $this->skipIf($driver instanceof Sqlserver, 'Incompatible with sqlserver');
         $this->_compareBakeTableResult('Products', __FUNCTION__);
     }
 }