Doctrine

Timestamp:

03/19/08 14:30:21 (16 months ago)

Author:

romanb

Message:

Ported validator refactorings partly from trunk.

Location:

branches/0.10

Files:

• lib/Doctrine/Query.php (modified) (2 diffs)
• lib/Doctrine/Relation/Association.php (modified) (1 diff)
• lib/Doctrine/Table.php (modified) (1 diff)
• lib/Doctrine/Validator.php (modified) (10 diffs)
• tests/ValidatorTestCase.php (modified) (4 diffs)

branches/0.10/lib/Doctrine/Query.php

@@ -763 +763 @@
 
                                 // build sql expression
+                                if ($this->_conn instanceof Doctrine_Connection_Oracle) {
+                                    $tableAlias = $this->_queryComponents[$componentAlias]['table']
+                                            ->getTableName();
+                                }
                                 $term[0] = $this->_conn->quoteIdentifier($tableAlias)
                                          . '.'
@@ -803 +807 @@
                                     if ($this->getType() === Doctrine_Query::SELECT) {
                                         // build sql expression
+                                        if ($this->_conn instanceof Doctrine_Connection_Oracle) {
+                                            $tableAlias = $this->_queryComponents[$componentAlias]['table']
+                                                    ->getTableName();
+                                        }
                                         $term[0] = $this->_conn->quoteIdentifier($tableAlias)
                                                  . '.'

branches/0.10/lib/Doctrine/Relation/Association.php

@@ -91 +91 @@
             $coll = new Doctrine_Collection($this->getTable());
         } else {
-            $coll = Doctrine_Query::create()->query($this->getRelationDql(1), array($id));
+            $coll = $this->getTable()->getConnection()->query($this->getRelationDql(1), array($id));
         }
         $coll->setReference($record, $this);

branches/0.10/lib/Doctrine/Table.php

@@ -1858 +1858 @@
     
     /**
+     * Gets the names of all validators that are applied on a field.
+     *
+     * @param string  The field name.
+     * @return array  The names of all validators that are applied on the specified field.
+     */
+    public function getFieldValidators($fieldName)
+    {
+        $validators = array();
+        $columnName = $this->getColumnName($fieldName);
+        // this loop is a dirty workaround to get the validators filtered out of
+        // the options, since everything is squeezed together currently
+        foreach ($this->_columns[$columnName] as $name => $args) {
+             if (empty($name)
+                    || $name == 'primary'
+                    || $name == 'protected'
+                    || $name == 'autoincrement'
+                    || $name == 'default'
+                    || $name == 'values'
+                    || $name == 'sequence'
+                    || $name == 'zerofill'
+                    || $name == 'owner'
+                    || $name == 'scale'
+                    || $name == 'type'
+                    || $name == 'length') {
+                continue;
+            }
+            if (strtolower($name) === 'notnull' && isset($this->_columns[$columnName]['autoincrement'])) {
+                continue;
+            }
+            $validators[$name] = $args;
+        }
+        
+        return $validators;
+    }
+    
+    /**
+     * Gets the (maximum) length of a field.
+     */
+    public function getFieldLength($fieldName)
+    {
+        return $this->_columns[$this->getColumnName($fieldName)]['length'];
+    }
+    
+    /**
      * getBoundQueryPart
      *

branches/0.10/lib/Doctrine/Validator.php

@@ -22 +22 @@
 /**
  * Doctrine_Validator
- *
- * Doctrine_Validator performs validations in record properties
+ * Doctrine_Validator performs validations on record properties
  *
  * @package     Doctrine
@@ -31 +30 @@
  * @since       1.0
  * @version     $Revision$
+ * @author      Roman Borschel <roman@code-factory.org>
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
@@ -38 +38 @@
      * @var array $validators           an array of validator objects
      */
-    private static $validators  = array();
+    private static $validators = array();
 
     /**
@@ -52 +52 @@
             if (class_exists($class)) {
                 self::$validators[$name] = new $class;
+            } else if (class_exists($name)) {
+                self::$validators[$name] = new $name;
             } else {
                 throw new Doctrine_Exception("Validator named '$name' not available.");
@@ -69 +71 @@
     public function validateRecord(Doctrine_Record $record)
     {
-        $columns   = $record->getTable()->getColumns();
-        $component = $record->getTable()->getComponentName();
+        $table = $record->getTable();
+        $columns   = $table->getColumns();
+        $component = $table->getComponentName();
 
         $errorStack = $record->getErrorStack();
@@ -76 +79 @@
         // if record is transient all fields will be validated
         // if record is persistent only the modified fields will be validated
-        $data = ($record->exists()) ? $record->getModified() : $record->getData();
-
-        $err      = array();
-        foreach ($data as $key => $value) {
+        $fields = ($record->exists()) ? $record->getModified() : $record->getData();
+        $err = array();
+        foreach ($fields as $fieldName => $value) {
             if ($value === self::$_null) {
                 $value = null;
@@ -85 +87 @@
                 $value = $value->getIncremented();
             }
-
-            $column = $columns[$record->getTable()->getColumnName($key)];
-
-            if ($column['type'] == 'enum') {
-                $value = $record->getTable()->enumIndex($key, $value);
-
-                if ($value === false) {
-                    $errorStack->add($key, 'enum');
-                    continue;
-                }
-            }
-
-            if ($record->getTable()->getAttribute(Doctrine::ATTR_VALIDATE) & Doctrine::VALIDATE_LENGTHS) {
-                if ( ! $this->validateLength($column, $key, $value)) {
-                    $errorStack->add($key, 'length');
-
-                    continue;
-                }
-            }
-
-            foreach ($column as $name => $args) {
-                if (empty($name)
-                    || $name == 'primary'
-                    || $name == 'protected'
-                    || $name == 'autoincrement'
-                    || $name == 'default'
-                    || $name == 'values'
-                    || $name == 'sequence'
-                    || $name == 'zerofill'
-                    || $name == 'owner'
-                    || $name == 'scale') {
-                    continue;
-                }
-
-                if (strtolower($name) === 'notnull' && isset($column['autoincrement'])) {
-                    continue;
-                }
-
-                if (strtolower($name) == 'length') {
-                    if ( ! ($record->getTable()->getAttribute(Doctrine::ATTR_VALIDATE) & Doctrine::VALIDATE_LENGTHS)) {
-                        if ( ! $this->validateLength($column, $key, $value)) {
-                            $errorStack->add($key, 'length');
-                        }
+            
+            $dataType = $table->getTypeOf($fieldName);
+
+            // Validate field type, if type validation is enabled
+            if ($table->getAttribute(Doctrine::ATTR_VALIDATE) & Doctrine::VALIDATE_TYPES) {
+                if ( ! self::isValidType($value, $dataType)) {
+                    $errorStack->add($fieldName, 'type');
+                }
+                if ($dataType == 'enum') {
+                    $enumIndex = $table->enumIndex($fieldName, $value);
+                    if ($enumIndex === false) {
+                        $errorStack->add($fieldName, 'enum');
                     }
-                    continue;
-                }
-
-                if (strtolower($name) == 'type') {
-                    if ( ! ($record->getTable()->getAttribute(Doctrine::ATTR_VALIDATE) & Doctrine::VALIDATE_TYPES)) {
-                        if ( ! self::isValidType($value, $column['type'])) {
-                            $errorStack->add($key, 'type');
-                        }
-                    }
-                    continue;
-                }
-
-                $validator = self::getValidator($name);
+                }
+            }
+            
+            // Validate field length, if length validation is enabled
+            if ($table->getAttribute(Doctrine::ATTR_VALIDATE) & Doctrine::VALIDATE_LENGTHS) {
+                if ( ! $this->validateLength($value, $dataType, $table->getFieldLength($fieldName))) {
+                    $errorStack->add($fieldName, 'length');
+                }
+            }
+
+            // Run all custom validators
+            foreach ($table->getFieldValidators($fieldName) as $validatorName => $args) {
+                if ( ! is_string($validatorName)) {
+                    $validatorName = $args;
+                    $args = array();
+                }
+                $validator = self::getValidator($validatorName);
                 $validator->invoker = $record;
-                $validator->field   = $key;
-                $validator->args    = $args;
-
+                $validator->field = $fieldName;
+                $validator->args = $args;
                 if ( ! $validator->validate($value)) {
-                    $errorStack->add($key, $name);
-
-                    //$err[$key] = 'not valid';
-
-                    // errors found quit validation looping for this column
-                    //break;
-                }
-            }
-
-            if ($record->getTable()->getAttribute(Doctrine::ATTR_VALIDATE) & Doctrine::VALIDATE_TYPES) {
-                if ( ! self::isValidType($value, $column['type'])) {
-                    $errorStack->add($key, 'type');
-                    continue;
+                    $errorStack->add($fieldName, $validatorName);
                 }
             }
@@ -168 +130 @@
      * Validates the length of a field.
      */
-    private function validateLength($column, $key, $value)
-    {
-        if ($column['type'] == 'timestamp' || $column['type'] == 'integer' || 
-                $column['type'] == 'enum') {
+    private function validateLength($value, $type, $maximumLength)
+    {
+        if ($type == 'timestamp' || $type == 'integer' || $type == 'enum') {
             return true;
-        } else if ($column['type'] == 'array' || $column['type'] == 'object') {
+        } else if ($type == 'array' || $type == 'object') {
             $length = strlen(serialize($value));
         } else {
             $length = strlen($value);
         }
-
-        if ($length > $column['length']) {
+        if ($length > $maximumLength) {
             return false;
         }
@@ -193 +153 @@
     {
         return (count($this->stack) > 0);
-    }
-
-    /**
-     * phpType
-     * converts a doctrine type to native php type
-     *
-     * @param $portableType     portable doctrine type
-     * @return string
-     *//*
-    public static function phpType($portableType)
-    {
-        switch ($portableType) {
-            case 'enum':
-                return 'integer';
-            case 'blob':
-            case 'clob':
-            case 'mbstring':
-            case 'timestamp':
-            case 'date':
-            case 'gzip':
-                return 'string';
-                break;
-            default:
-                return $portableType;
-        }
-    }*/
-    /**
-     * returns whether or not the given variable is
-     * valid type
-     *
-     * @param mixed $var
-     * @param string $type
-     * @return boolean
-     */
-     /*
-    public static function isValidType($var, $type)
-    {
-        if ($type == 'boolean') {
-            return true;
-        }
-
-        $looseType = self::gettype($var);
-        $type      = self::phpType($type);
-
-        switch ($looseType) {
-            case 'float':
-            case 'double':
-            case 'integer':
-                if ($type == 'string' || $type == 'float') {
-                    return true;
-                }
-            case 'string':
-            case 'array':
-            case 'object':
-                return ($type === $looseType);
-                break;
-            case 'NULL':
-                return true;
-                break;
-        }
-    }*/
-    
+    }    
     
     /**
@@ -302 +201 @@
          }
      }
-    
-    
-    /**
-     * returns the type of loosely typed variable
-     *
-     * @param mixed $var
-     * @return string
-     *//*
-    public static function gettype($var)
-    {
-        $type = gettype($var);
-        switch ($type) {
-            case 'string':
-                if (preg_match("/^[0-9]+$/",$var)) {
-                    return 'integer';
-                } elseif (is_numeric($var)) {
-                    return 'float';
-                } else {
-                    return $type;
-                }
-                break;
-            default:
-                return $type;
-        }
-    }*/
 }

branches/0.10/tests/ValidatorTestCase.php

@@ -113 +113 @@
     }
 
+    /*public function testDecimalType()
+    {
+        $validDecimals = array('99.22', 99999.3);
+        foreach ($validDecimals as $value) {
+            $this->assertTrue(Doctrine_Validator::isValidType($value, 'decimal'));
+        }
+        
+        $invalidDecimals = array('decimal', '99999999', '99999999.3', '0.0002', 0.001);
+        foreach ($invalidDecimals as $value) {
+            $this->assertFalse(Doctrine_Validator::isValidType($value, 'decimal'));
+        }
+        
+    }*/
 
     public function testValidate2() 
@@ -140 +153 @@
     public function testValidate() 
     {
+        $this->manager->setAttribute(Doctrine::ATTR_VALIDATE, Doctrine::VALIDATE_ALL);
         $user = $this->connection->getTable('User')->find(4);
 
@@ -172 +186 @@
 
         $this->assertTrue(in_array('unique', $stack['address']));
+        $this->manager->setAttribute(Doctrine::ATTR_VALIDATE, Doctrine::VALIDATE_NONE);
     }
 
@@ -383 +398 @@
             $s = $dve->getInvalidRecords();
             $this->assertEqual(1, count($dve->getInvalidRecords()));
+            $invalids = $dve->getInvalidRecords();
+            //var_dump($invalids[0]->getErrorStack());
+            //echo "<br/><br/>";
+            //var_dump($invalids[1]->getErrorStack());
             $stack = $client->ValidatorTest_AddressModel[0]->getErrorStack();