Changeset 534 for trunk/bin/module_maker/validation.cli.php

Timestamp:

Jul 27, 2015 7:56:08 AM (9 years ago)

Author:

anonymous

Message:

Improved module maker validation output. Allow disabling cache at run time for ACL. Added ACL getList() method. Improved ACL CLI listing. Fixed app boomerang array initialization. Now retaining identical boomerang URLs if the key is different. Added a maximum boomerang time. Added a way to disable cache per request through a query string. Added validator isDecimal() method. Added disableSelectOptions() HTML method. Added getGravatarURL() method. Change how navigation page array is managed. Updated navigation currentPage() method to test an array of URLs.

File:

• trunk/bin/module_maker/validation.cli.php (modified) (5 diffs)

trunk/bin/module_maker/validation.cli.php

@@ -73 +73 @@
         $field = $col[0];
         $title = ucfirst(str_replace('_', ' ', $field));
-        $type = preg_replace('/^(\w+).*$/', '\\1', $col[1]);
+        $type = preg_replace('/^(\w+).*$/', '$1', $col[1]);
+        $max_dig = preg_replace('/^\w+\((\d+)(?:,\d+)?\).*$/', '$1', $col[1]);
+        $max_dec = preg_replace('/^\w+\((?:\d+)(?:,(\d+))?\).*$/', '$1', $col[1]);
         $is_primary_key = ('PRI' == $col[3]);
         $unsigned = preg_match('/\s+unsigned\s*$/i', $col[1]);
@@ -110 +112 @@
         case 'varchar' :
             $len_type = 'string';
-            $max_length = 255;
+            $max_length = '' != $max_dig ? $max_dig : 255;
             break;
 
@@ -131 +133 @@
             break;
 
+        case 'bit' :
+            $len_type = 'num';
+            $min = 0;
+            $max = '' != $max_dig ? $max_dig : 64;
+            break;
+
         case 'tinyint' :
-        case 'bit' :
         case 'bool' :
             $len_type = 'num';
@@ -191 +198 @@
         case 'float' :
             $len_type = 'num';
-            $min = -3.40282E+38;
-            $max = 3.40282E+38;
+            if ($unsigned) {
+                $min = 0;
+                $max = 3.40282E+38;
+            } else {
+                $min = -3.40282E+38;
+                $max = 3.40282E+38;
+            }
             break;
 
         case 'double' :
         case 'double precision' :
+            $len_type = 'num';
+            if ($unsigned) {
+                $min = 0;
+                $max = 1.7976931348623157E+308;
+            } else {
+                $min = -1.7976931348623157E+308;
+                $max = 1.7976931348623157E+308;
+            }
+            break;
+
         case 'real' :
         case 'decimal' :
         case 'dec' :
         case 'numeric' :
-            $len_type = 'num';
-            $min = -1.79769E+308;
-            $max = 1.79769E+308;
+        case 'fixed' :
+            $len_type = 'decimal'; // This doesn't match anything, on purpose.
             break;
 
@@ -255 +276 @@
 
         case 'float' :
-        case 'float' :
         case 'double' :
-        case 'double' :
+            $negative_ok = $unsigned ? '' : ', true';
+            $o[] = "\$fv->isFloat('$field', sprintf(_(\"%s must be a valid number.\"), _(\"$title\"))$negative_ok);";
+            break;
+
         case 'real' :
         case 'decimal' :
         case 'dec' :
         case 'numeric' :
-            $negative_ok = $unsigned ? '' : ', true';
-            $o[] = "\$fv->isFloat('$field', sprintf(_(\"%s must be a valid number.\"), _(\"$title\"))$negative_ok);";
+        case 'float' :
+            $max = str_repeat('9', $max_dig - $max_dec);
+            if ($max_dec > 0) {
+                $max .= '.' . str_repeat('9', $max_dec);
+            }
+            if ($unsigned) {
+                $negative_ok = 'false';
+                $min = 0;
+            } else {
+                $negative_ok = 'true';
+                $min = -$max;
+            }
+            $negative_ok = $unsigned ? 'false' : 'true';
+            $o[] = "\$fv->isDecimal('$field', sprintf(_(\"%s must be a number between %d and %d.\"), _(\"$title\"), $min, $max), $negative_ok, $max_dig, $max_dec);";
             break;