Changeset 5158 for branches/experimental

Timestamp:

11/06/08 21:26:15 (2 months ago)

Author:

guilhermeblanco

Message:

Branched 1.1 and imported already done stuff for CTI implementation.

Location:

branches/experimental/gblanco

Files:

• . (copied) (copied from branches/1.1) (1 prop)
• lib/Doctrine/Hydrator.php (modified) (2 diffs)
• lib/Doctrine/Hydrator/RecordDriver.php (modified) (2 diffs)
• lib/Doctrine/Query.php (modified) (6 diffs)
• lib/Doctrine/Record.php (modified) (2 diffs)
• lib/Doctrine/Record/Abstract.php (modified) (1 diff)
• tests/ClassTableInheritanceTestCase.php (modified) (2 diffs)
• tests/CTII18nTestCase.php (added)
• tests/CTITreeStructureTestCase.php (added)
• tests/models/CTII18nTest.php (added)
• tests/models/CTITreeLeaf.php (added)
• tests/NewClassTableInheritanceTestCase.php (added)
• tests/run.php (modified) (1 diff)

branches/experimental/gblanco/lib/Doctrine/Hydrator.php

@@ -335 +335 @@
             }
 
-            if ($cache[$key]['isSimpleType']) {
-                $rowData[$dqlAlias][$fieldName] = $value;
-            } else {
-                $rowData[$dqlAlias][$fieldName] = $table->prepareValue(
-                        $fieldName, $value, $cache[$key]['type']);
+            // CTI field assignment
+            $fieldValue = ($cache[$key]['isSimpleType']) ? $value 
+                : $table->prepareValue($fieldName, $value, $cache[$key]['type']);
+
+            if (isset($map['joinedParentComponentAlias'])) { 
+                $rowData[$map['joinedParentComponentAlias']][$table->getComponentName()][$fieldName] = $fieldValue; 
+            } else { 
+                $rowData[$dqlAlias][$fieldName] = $fieldValue;
             }
 
@@ -346 +349 @@
             // So we know that all aggregate values will always be available in the root component
             if ($agg) {
-                $rowData[$this->_rootAlias][$fieldName] = $rowData[$dqlAlias][$fieldName];
+                $rowData[$this->_rootAlias][$fieldName] = $fieldValue;
             }
 

branches/experimental/gblanco/lib/Doctrine/Hydrator/RecordDriver.php

@@ -78 +78 @@
     public function getElement(array $data, $component)
     {
+        $parentTable =  Doctrine::getTable($component);
         $component = $this->_getClassNameToReturn($data, $component);
+
         if ( ! isset($this->_tables[$component])) {
             $this->_tables[$component] = Doctrine::getTable($component);
             $this->_tables[$component]->setAttribute(Doctrine::ATTR_LOAD_REFERENCES, false);
+        }
+
+        $componentTable = $this->_tables[$component]; 
+
+        foreach($parentTable->getJoinedInheritanceMapChildren() as $child) { 
+            if (
+                    isset($data[$child]) && 
+                (in_array($child, $componentTable->getOption('joinedParents')) || $child == $componentTable->getComponentName())
+            ) { 
+                $data = array_merge($data, $data[$child]); 
+            }
+
+            if (isset($data[$child])) { 
+                unset($data[$child]); 
+            } 
         }
 
@@ -151 +168 @@
             $this->_tables[$component]->setAttribute(Doctrine::ATTR_LOAD_REFERENCES, false);
         }
+
+        if (($joinedClasses = $this->_tables[$component]->getOption('joinedInheritanceMap'))) { 
+            foreach ($joinedClasses as $class=>$conditions) { 
+                list($key, $value) = each($conditions);
+ 
+                if (isset($data[$key]) && $data[$key] == $value) { 
+                    return $class; 
+                }  
+            } 
+        }
         
         if ( ! ($subclasses = $this->_tables[$component]->getOption('subclasses'))) {

branches/experimental/gblanco/lib/Doctrine/Query.php

@@ -494 +494 @@
 
         $fields = $this->_pendingFields[$componentAlias];
+        $childFields = array();
 
         // check for wildcards
         if (in_array('*', $fields)) {
             $fields = $table->getFieldNames();
+
+            // CTI fields lookup
+            if ($children = $table->getJoinedInheritanceMapChildren()) { 
+                foreach ($children as $child) { 
+                    $childTable = $this->_conn->getTable($child); 
+                    $ownedColumns =  $childTable->getOwnedColumns(); 
+                    $childFields[$child] = $ownedColumns; 
+                } 
+            }
         } else {
             // only auto-add the primary key fields if this query object is not
@@ -509 +519 @@
 
         $sql = array();
+
         foreach ($fields as $fieldName) {
             $columnName = $table->getColumnName($fieldName);
@@ -526 +537 @@
                        . $this->_conn->quoteIdentifier($tableAlias . '__' . $columnName);
             }
+        }
+
+        // CTI fields inclusion in SQL
+        foreach ($childFields as $childTableName=>$childColumns) { 
+            foreach ($childColumns as $fieldName) { 
+                $columnName = $table->getColumnName($fieldName); 
+                $child = $this->_conn->getTable($childTableName); 
+                $columnName = $child->getColumnName($fieldName); 
+                $childAlias = $this->getTableAlias($componentAlias . '.' . $child->getComponentName()); 
+                $sql[] = $this->_conn->quoteIdentifier($childAlias . '.' . $columnName) 
+                       . ' AS ' 
+                       . $this->_conn->quoteIdentifier($childAlias . '__' . $columnName); 
+            } 
         }
 
@@ -1790 +1814 @@
         $this->_tableAliasMap[$tableAlias] = $componentAlias;
 
+        $this->_queryComponents[$componentAlias] = array('table' => $table, 'map' => null);
+
         $queryPart .= $this->buildInheritanceJoinSql($name, $componentAlias);
 
         $this->_sqlParts['from'][] = $queryPart;
-
-        $this->_queryComponents[$componentAlias] = array('table' => $table, 'map' => null);
 
         return $table;
@@ -1826 +1850 @@
             $parentTableAlias = $this->getTableAlias($parentAlias, $parentTable->getTableName());
 
-            $queryPart .= ' LEFT JOIN ' . $this->_conn->quoteIdentifier($parentTable->getTableName())
+            $queryPart .= ' INNER JOIN ' . $this->_conn->quoteIdentifier($parentTable->getTableName())
                         . ' ' . $this->_conn->quoteIdentifier($parentTableAlias) . ' ON ';
 
@@ -1838 +1862 @@
                             . '.' . $this->_conn->quoteIdentifier($column);
             }
+        }
+
+        // CTI table relation join building
+        if ($subchildren = $table->getJoinedInheritanceMapChildren()) { 
+            foreach ($subchildren as $subchild) { 
+                $subchildTable = $this->_conn->getTable($subchild); 
+                $subchildAlias = $componentAlias . '.' . $subchild; 
+
+                // Get the short alias for the parent table 
+                $subchildTableAlias = $this->getTableAlias($subchildAlias, $subchildTable->getTableName()); 
+                        
+                $queryPart .= ' LEFT JOIN ' . $this->_conn->quoteIdentifier($subchildTable->getTableName()) 
+                           . ' ' . $this->_conn->quoteIdentifier($subchildTableAlias) . ' ON '; 
+
+                $this->_queryComponents[$subchildAlias] = array('table' => $subchildTable, 'map' => null, 'joinedParentComponentAlias' => $componentAlias); 
+
+                //Doctrine::dump($table->getIdentifier()); 
+                foreach ((array) $table->getIdentifier() as $identifier) { 
+                    $column = $table->getColumnName($identifier); 
+
+                    $queryPart .= $this->_conn->quoteIdentifier($tableAlias)  
+                               . '.' . $this->_conn->quoteIdentifier($column) 
+                               . ' = ' . $this->_conn->quoteIdentifier($subchildTableAlias) 
+                               . '.' . $this->_conn->quoteIdentifier($column); 
+                } 
+            } 
         }
 

branches/experimental/gblanco/lib/Doctrine/Record.php

@@ -1556 +1556 @@
                     if ($this->_data[$field] instanceof Doctrine_Record) {
                         $a[$field] = $this->_data[$field]->getIncremented();
+
                         if ($a[$field] !== null) {
                             $this->_data[$field] = $a[$field];
@@ -1567 +1568 @@
                     }
                     */
+            }
+        }
+
+        // CTI modified fields inclusion 
+        $map = $this->_table->joinedInheritanceMap;
+
+        if ($map != null) {
+            $map = (isset($map[get_class($this)])) ? $map[get_class($this)] : array();
+        } else {
+            $map = $this->_table->inheritanceMap;
+        }
+
+        foreach ($map as $k => $v) {
+            $old = $this->get($k, false);
+
+            if ((string) $old !== (string) $v || $old === null) {
+                $a[$k] = $v;
+                $this->_data[$k] = $v;
             }
         }

branches/experimental/gblanco/lib/Doctrine/Record/Abstract.php

@@ -147 +147 @@
     }
 
+    public function setJoinedInheritanceMap($map) 
+    { 
+        $this->_table->setOption('joinedInheritanceMap', $map); 
+    }
+
     public function setSubclasses($map)
     {

branches/experimental/gblanco/tests/ClassTableInheritanceTestCase.php

@@ -112 +112 @@
         $q->from('CTITest c')->where('c.id = 1');
 
-        $this->assertEqual($q->getSql(), 'SELECT c.id AS c__id, c3.added AS c__added, c2.name AS c__name, c2.verified AS c__verified, c.age AS c__age FROM c_t_i_test_parent4 c LEFT JOIN c_t_i_test_parent2 c2 ON c.id = c2.id LEFT JOIN c_t_i_test_parent3 c3 ON c.id = c3.id WHERE c.id = 1');
+        $this->assertEqual($q->getSql(), 'SELECT c.id AS c__id, c3.added AS c__added, c2.name AS c__name, c2.verified AS c__verified, c.age AS c__age FROM c_t_i_test_parent4 c INNER JOIN c_t_i_test_parent2 c2 ON c.id = c2.id INNER JOIN c_t_i_test_parent3 c3 ON c.id = c3.id WHERE c.id = 1');
 
         $record = $q->fetchOne();
@@ -128 +128 @@
         $q->from('CTITest c')->where("c.name = 'Jack'");
 
-        $this->assertEqual($q->getSql(), "SELECT c.id AS c__id, c3.added AS c__added, c2.name AS c__name, c2.verified AS c__verified, c.age AS c__age FROM c_t_i_test_parent4 c LEFT JOIN c_t_i_test_parent2 c2 ON c.id = c2.id LEFT JOIN c_t_i_test_parent3 c3 ON c.id = c3.id WHERE c2.name = 'Jack'");
+        $this->assertEqual($q->getSql(), "SELECT c.id AS c__id, c3.added AS c__added, c2.name AS c__name, c2.verified AS c__verified, c.age AS c__age FROM c_t_i_test_parent4 c INNER JOIN c_t_i_test_parent2 c2 ON c.id = c2.id INNER JOIN c_t_i_test_parent3 c3 ON c.id = c3.id WHERE c2.name = 'Jack'");
 
         $q = new Doctrine_Query();
         $q->from('CTITest c')->where("name = 'Jack'");
 
-        $this->assertEqual($q->getSql(), "SELECT c.id AS c__id, c3.added AS c__added, c2.name AS c__name, c2.verified AS c__verified, c.age AS c__age FROM c_t_i_test_parent4 c LEFT JOIN c_t_i_test_parent2 c2 ON c.id = c2.id LEFT JOIN c_t_i_test_parent3 c3 ON c.id = c3.id WHERE c2.name = 'Jack'");
+        $this->assertEqual($q->getSql(), "SELECT c.id AS c__id, c3.added AS c__added, c2.name AS c__name, c2.verified AS c__verified, c.age AS c__age FROM c_t_i_test_parent4 c INNER JOIN c_t_i_test_parent2 c2 ON c.id = c2.id INNER JOIN c_t_i_test_parent3 c3 ON c.id = c3.id WHERE c2.name = 'Jack'");
     }
 

branches/experimental/gblanco/tests/run.php

@@ -258 +258 @@
 $inheritance->addTestCase(new Doctrine_ColumnAggregationInheritance_TestCase());
 $inheritance->addTestCase(new Doctrine_ClassTableInheritance_TestCase());
+$inheritance->addTestCase(new Doctrine_NewClassTableInheritance_TestCase());
+$inheritance->addTestCase(new Doctrine_CTITreeStructure_TestCase());
+$inheritance->addTestCase(new Doctrine_CTII18n_TestCase());
 $inheritance->addTestCase(new Doctrine_Query_ApplyInheritance_TestCase());
 $test->addTestCase($inheritance);