Doctrine

Timestamp:

08/12/08 02:19:49 (11 months ago)

Author:

jwage

Message:

BC BREAK - Completely removing emulated enum conversions. Version 1.0 will store complete enum value in varchar(255) column by default.

Location:

branches/1.0

Files:

• lib/Doctrine/DataDict/Firebird.php (modified) (2 diffs)
• lib/Doctrine/DataDict/Informix.php (modified) (1 diff)
• lib/Doctrine/DataDict/Mssql.php (modified) (2 diffs)
• lib/Doctrine/DataDict/Mysql.php (modified) (2 diffs)
• lib/Doctrine/DataDict/Oracle.php (modified) (2 diffs)
• lib/Doctrine/DataDict/Pgsql.php (modified) (2 diffs)
• lib/Doctrine/DataDict/Sqlite.php (modified) (2 diffs)
• lib/Doctrine/Query.php (modified) (4 diffs)
• lib/Doctrine/Query/Abstract.php (modified) (5 diffs)
• lib/Doctrine/Query/JoinCondition.php (modified) (4 diffs)
• lib/Doctrine/Query/Where.php (modified) (3 diffs)
• lib/Doctrine/RawSql.php (modified) (1 diff)
• lib/Doctrine/Record.php (modified) (2 diffs)
• lib/Doctrine/Table.php (modified) (1 diff)
• tests/DataType/EnumTestCase.php (modified) (2 diffs)
• tests/Query/WhereTestCase.php (modified) (1 diff)

branches/1.0/lib/Doctrine/DataDict/Firebird.php

@@ -61 +61 @@
         }
         switch ($field['type']) {
+            case 'enum':
+                $field['length'] = isset($field['length']) && $field['length'] ? $field['length']:255;
             case 'varchar':
             case 'string':
@@ -79 +81 @@
                 return 'BLOB SUB_TYPE 0';
             case 'integer':
-            case 'enum':
             case 'int':
                 return 'INT';

branches/1.0/lib/Doctrine/DataDict/Informix.php

@@ -62 +62 @@
         switch ($field['type']) {
             case 'char':
+            case 'enum':
+                $field['length'] = isset($field['length']) && $field['length'] ? $field['length']:255;
             case 'varchar':
             case 'array':

branches/1.0/lib/Doctrine/DataDict/Mssql.php

@@ -63 +63 @@
         }
         switch ($field['type']) {
+            case 'enum':
+                $field['length'] = isset($field['length']) && $field['length'] ? $field['length']:255;
             case 'array':
             case 'object':
@@ -94 +96 @@
                 return 'IMAGE';
             case 'integer':
-            case 'enum':
             case 'int':
                 return 'INT';

branches/1.0/lib/Doctrine/DataDict/Mysql.php

@@ -143 +143 @@
 
                 return $length ? 'CHAR('.$length.')' : 'CHAR(255)';
+            case 'enum':
+                if ($this->conn->getAttribute(Doctrine::ATTR_USE_NATIVE_ENUM)) {
+                    $values = array();
+                    foreach ($field['values'] as $value) {
+                      $values[] = $this->conn->quote($value, 'varchar');
+                    }
+                    return 'ENUM('.implode(', ', $values).')';
+                } else {
+                    $field['length'] = isset($field['length']) && $field['length'] ? $field['length']:255;
+                }
             case 'varchar':
             case 'array':
@@ -185 +195 @@
                 }
                 return 'LONGBLOB';
-            case 'enum':
-                if ($this->conn->getAttribute(Doctrine::ATTR_USE_NATIVE_ENUM)) {
-                    $values = array();
-                    foreach ($field['values'] as $value) {
-                      $values[] = $this->conn->quote($value, 'varchar');
-                    }
-                    return 'ENUM('.implode(', ', $values).')';
-                }
-                // fall back to integer
             case 'integer':
             case 'int':

branches/1.0/lib/Doctrine/DataDict/Oracle.php

@@ -59 +59 @@
         }
         switch ($field['type']) {
+            case 'enum':
+                $field['length'] = isset($field['length']) && $field['length'] ? $field['length']:255;
             case 'string':
             case 'array':
@@ -76 +78 @@
                 return 'BLOB';
             case 'integer':
-            case 'enum':
             case 'int':
                 if ( ! empty($field['length'])) {

branches/1.0/lib/Doctrine/DataDict/Pgsql.php

@@ -364 +364 @@
         }
         switch ($field['type']) {
+            case 'enum':
+                $field['length'] = isset($field['length']) && $field['length'] ? $field['length']:255;
             case 'char':
             case 'string':
@@ -382 +384 @@
             case 'blob':
                 return 'BYTEA';
-            case 'enum':
             case 'integer':
             case 'int':

branches/1.0/lib/Doctrine/DataDict/Sqlite.php

@@ -61 +61 @@
         }
         switch ($field['type']) {
+            case 'enum':
+                $field['length'] = isset($field['length']) && $field['length'] ? $field['length']:255;
             case 'text':
             case 'object':
@@ -98 +100 @@
                 }
                 return 'LONGBLOB';
-            case 'enum':
             case 'integer':
             case 'boolean':

branches/1.0/lib/Doctrine/Query.php

@@ -237 +237 @@
 
     /**
-     * addEnumParam
-     * sets input parameter as an enumerated parameter
-     *
-     * @param string $key   the key of the input parameter
-     * @return Doctrine_Query
-     */
-    public function addEnumParam($key, $table = null, $column = null)
-    {
-        $array = (isset($table) || isset($column)) ? array($table, $column) : array();
-
-        if ($key === '?') {
-            $this->_enumParams[] = $array;
-        } else {
-            $this->_enumParams[$key] = $array;
-        }
-    }
-
-    /**
-     * getEnumParams
-     * get all enumerated parameters
-     *
-     * @return array    all enumerated parameters
-     */
-    public function getEnumParams()
-    {
-        return $this->_enumParams;
-    }
-
-
-    /**
      * fetchArray
      * Convenience method to execute using array fetching as hydration mode.
@@ -1084 +1054 @@
         }
         $this->_state = self::STATE_CLEAN;
-
-        $params = $this->convertEnums($params);
 
         // Proceed with the generated SQL
@@ -1881 +1849 @@
         $params = array_merge($this->_params['join'], $this->_params['where'], $this->_params['having'], $params);
 
-        $params = $this->convertEnums($params);
-
         $results = $this->getConnection()->fetchAll($q, $params);
 
@@ -1955 +1921 @@
         $this->_parsers = array();
         $this->_dqlParts = array();
-        $this->_enumParams = array();
     }
 

branches/1.0/lib/Doctrine/Query/Abstract.php

@@ -227 +227 @@
 
     /**
-     * @var array $_enumParams              an array containing the keys of the parameters that should be enumerated
-     */
-    protected $_enumParams = array();
-
-    /**
      * @var boolean
      */
     protected $_isLimitSubqueryUsed = false;
-
-    protected $_pendingSetParams = array();
 
     /**
@@ -579 +572 @@
     {
         return $this->_isLimitSubqueryUsed;
-    }
-
-    /**
-     * convertEnums
-     * convert enum parameters to their integer equivalents
-     *
-     * @return array    converted parameter array
-     */
-    public function convertEnums($params)
-    {
-        $table = $this->getRoot();
-
-        // $position tracks the position of the parameter, to ensure we're converting
-        // the right parameter value when simple ? placeholders are used.
-        // This only works because SET is only allowed in update statements and it's
-        // the first place where parameters can occur.. see issue #935
-        $position = 0;
-        foreach ($this->_pendingSetParams as $fieldName => $value) {
-            $e = explode('.', $fieldName);
-            $fieldName = isset($e[1]) ? $e[1]:$e[0];
-            if ($table->getTypeOf($fieldName) == 'enum') {
-                $value = $value === '?' ? $position : $value;
-                $this->addEnumParam($value, $table, $fieldName);
-            }
-            ++$position;
-        }
-        $this->_pendingSetParams = array();
-
-        foreach ($this->_enumParams as $key => $values) {
-            if (isset($params[$key])) {
-                if ( ! empty($values)) {
-                    $params[$key] = $values[0]->enumIndex($values[1], $params[$key]);
-                }
-            }
-        }
-
-        return $params;
     }
 
@@ -958 +914 @@
                 $query = $this->getSqlQuery($params);
             }
-            $params = $this->convertEnums($params);
         } else {
             $query = $this->_view->getSelectSql();
@@ -1257 +1212 @@
 
         // if there's no params, return (else we'll get a WHERE IN (), invalid SQL)
-        if (!count($params))
-          return $this;
+        if ( ! count($params)) {
+            return $this;
+        }
 
         $a = array();
@@ -1418 +1374 @@
                 }
             }
-
-            $this->_pendingSetParams[$key] = $value;
 
             return $this->_addDqlQueryPart('set', $key . ' = ' . $value, true);

branches/1.0/lib/Doctrine/Query/JoinCondition.php

@@ -72 +72 @@
             $map       = $this->query->getAliasDeclaration($reference);
             $table     = $map['table'];
-            // check if value is enumerated value
-            $enumIndex = $table->enumIndex($field, trim($value, "'"));
-
-            if (false !== $enumIndex && $conn->getAttribute(Doctrine::ATTR_USE_NATIVE_ENUM)) {
-                $enumIndex = $conn->quote($enumIndex, 'text');
-            }
 
             // FIX: Issues with "(" XXX ")"
@@ -105 +99 @@
                     $value = array();
                     foreach ($e as $part) {
-                        $index = $table->enumIndex($field, trim($part, "'"));
-
-                        if (false !== $index && $conn->getAttribute(Doctrine::ATTR_USE_NATIVE_ENUM)) {
-                            $index = $conn->quote($index, 'text');
-                        }
-
-                        if ($index !== false) {
-                            $value[] = $index;
-                        } else {
-                            $value[] = $this->parseLiteralValue($part);
-                        }
+                        $value[] = $this->parseLiteralValue($part);
                     }
 
@@ -123 +107 @@
                 }
             } else {
-                if ($enumIndex !== false) {
-                    $value = $enumIndex;
-                } else {
-                    $value = $this->parseLiteralValue($value);
-                }
+                $value = $this->parseLiteralValue($value);
             }
 
@@ -135 +115 @@
                 case '=':
                 case '!=':
-                    if ($enumIndex !== false) {
-                        $value  = $enumIndex;
-                    }
                 default:
                     $leftExpr = (($hasLeftAggExpression) ? $leftMatches[1] . '(' : '') 

branches/1.0/lib/Doctrine/Query/Where.php

@@ -91 +91 @@
         $conn = $this->query->getConnection();
 
+        // If value is contained in paranthesis
         if (substr($value, 0, 1) == '(') {
             // trim brackets
             $trimmed = $this->_tokenizer->bracketTrim($value);
 
+            // If subquery found which begins with FROM and SELECT
+            // FROM User u WHERE u.id IN(SELECT u.id FROM User u WHERE u.id = 1)
             if (substr($trimmed, 0, 4) == 'FROM' ||
                 substr($trimmed, 0, 6) == 'SELECT') {
@@ -102 +105 @@
                 $value = '(' . $this->query->createSubquery()->parseQuery($trimmed, false)->getQuery() . ')';
 
+            // If custom sql for custom subquery
+            // You can specify SQL: followed by any valid sql expression
+            // FROM User u WHERE u.id = SQL:(select id from user where id = 1)
             } elseif (substr($trimmed, 0, 4) == 'SQL:') {
                 $value = '(' . substr($trimmed, 4) . ')';
+            // simple in expression found
             } else {
-                // simple in expression found
                 $e = $this->_tokenizer->sqlExplode($trimmed, ',');
 
@@ -113 +119 @@
 
                 foreach ($e as $part) {
-                    if (isset($table) && isset($field)) {
-                        $index = $table->enumIndex($field, trim($part, "'"));
-
-                        if (false !== $index && $conn->getAttribute(Doctrine::ATTR_USE_NATIVE_ENUM)) {
-                            $index = $conn->quote($index, 'text');
-                        }
-                    }
-
-                    if ($index !== false) {
-                        $value[] = $index;
-                    } else {
-                        $value[] = $this->parseLiteralValue($part);
-                    }
+                    $value[] = $this->parseLiteralValue($part);
                 }
 
                 $value = '(' . implode(', ', $value) . ')';
             }
-        } else if (substr($value, 0, 1) == ':' || $value === '?') {
-            // placeholder found
-            if (isset($table) && isset($field) && $table->getTypeOf($field) == 'enum') {
-                $this->query->addEnumParam($value, $table, $field);
-            } else {
-                $this->query->addEnumParam($value, null, null);
-            }
         } else {
-            $enumIndex = false;
-            if (isset($table) && isset($field)) {
-                // check if value is enumerated value
-                $enumIndex = $table->enumIndex($field, trim($value, "'"));
-
-                if (false !== $enumIndex && $conn->getAttribute(Doctrine::ATTR_USE_NATIVE_ENUM)) {
-                    $enumIndex = $conn->quote($enumIndex, 'text');
-                }
-            }
-
-            if ($enumIndex !== false) {
-                $value = $enumIndex;
-            } else {
-                $value = $this->parseLiteralValue($value);
-            }
+            $value = $this->parseLiteralValue($value);
         }
         return $value;

branches/1.0/lib/Doctrine/RawSql.php

@@ -321 +321 @@
         $params = array_merge($this->_params['join'], $this->_params['where'], $this->_params['having'], $params);
 
-        $params = $this->convertEnums($params);
-
         $results = $this->getConnection()->fetchAll($q, $params);
 

branches/1.0/lib/Doctrine/Record.php

@@ -593 +593 @@
                         $vars['_data'][$k] = gzcompress($vars['_data'][$k]);
                         break;
-                    case 'enum':
-                        $vars['_data'][$k] = $this->_table->enumIndex($k, $vars['_data'][$k]);
-                        break;
                 }
             }
@@ -1241 +1238 @@
                     $a[$field] = $this->getTable()->getConnection()->convertBooleans($this->_data[$field]);
                 break;
-                case 'enum':
-                    $a[$field] = $this->_table->enumIndex($field, $this->_data[$field]);
-                    break;
                 default:
                     if ($this->_data[$field] instanceof Doctrine_Record) {

branches/1.0/lib/Doctrine/Table.php

@@ -609 +609 @@
 
             switch ($definition['type']) {
-                case 'enum':
-                    if (isset($definition['default'])) {
-                        $definition['default'] = $this->enumIndex($name, $definition['default']);
-                    }
-                    break;
                 case 'boolean':
                     if (isset($definition['default'])) {

branches/1.0/tests/DataType/EnumTestCase.php

@@ -106 +106 @@
             $this->assertEqual($ret, 1);
         } catch (Exception $e) {
-            $this->fail();
+            $this->fail($e->getMessage());
         }
     }
@@ -239 +239 @@
           ->execute();
 
-        $this->assertEqual($q->getQuery(), "SELECT e.id AS e__id, e.status AS e__status, e.text AS e__text, e2.text AS e2__text FROM enum_test e LEFT JOIN enum_test3 e2 ON e.text = e2.text WHERE e.status = 1");
+        $this->assertEqual($q->getQuery(), "SELECT e.id AS e__id, e.status AS e__status, e.text AS e__text, e2.text AS e2__text FROM enum_test e LEFT JOIN enum_test3 e2 ON e.text = e2.text WHERE e.status = 'verified'");
+    }
+
+    public function testInvalidValueErrors()
+    {
+        $orig = Doctrine_Manager::getInstance()->getAttribute(Doctrine::ATTR_VALIDATE);
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine::ATTR_VALIDATE, Doctrine::VALIDATE_ALL);
+        try {
+            $test = new EnumTest();
+            $test->status = 'opeerertn';
+            $test->save();
+            $this->fail();
+        } catch (Exception $e) {
+            $this->pass();
+        }
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine::ATTR_VALIDATE, $orig);
     }
 }

branches/1.0/tests/Query/WhereTestCase.php

@@ -263 +263 @@
         $this->assertEqual($q->getQuery(), "SELECT e.id AS e__id FROM entity e LEFT JOIN groupuser g ON e.id = g.user_id LEFT JOIN entity e2 ON e2.id = g.group_id AND e2.type = 1 WHERE e2.name = 'some group' AND (e.type = 0)");
     }
-    public function testEnumValuesWorkInPlaceholders()
-    {
-        $e = new EnumTest;
-        $e->status = 'verified';
-        $e->save();
-
-        $q = new Doctrine_Query();
-        
-        $q->select('e.*')->from('EnumTest e')->where('e.status = ?');
-
-        $q->getQuery();
-
-        $this->assertEqual(count($q->getEnumParams()), 1);
-
-        $q->execute(array('verified'));
-    }
-
-    public function testEnumValuesWorkWithMultiplePlaceholders()
-    {
-        $q = new Doctrine_Query();
-
-        $q->select('e.*')->from('EnumTest e')->where('e.id = ? AND e.status = ?');
-        
-        $q->getQuery();
-
-        $p = $q->getEnumParams();
-        $this->assertEqual(array_keys($p), array(0, 1));
-        $this->assertTrue(empty($p[0]));
-        $q->execute(array(1, 'verified'));
-    }
-
-    public function testEnumValuesWorkWithMultipleNamedPlaceholders()
-    {
-        $q = new Doctrine_Query();
-
-        $q->select('e.*')->from('EnumTest e')->where('e.id = :id AND e.status = :status');
-        
-        $q->getQuery();
-
-        $p = $q->getEnumParams();
-        $this->assertEqual(array_keys($p), array(':id', ':status'));
-        $this->assertTrue(empty($p[':id']));
-        $q->execute(array(1, 'verified'));
-    }
 
     public function testLiteralValueAsInOperatorOperandIsSupported()