Doctrine

Timestamp:

06/08/08 20:55:26 (13 months ago)

Author:

jwage

Message:

fixes #1121

Location:

branches/0.11/lib

Files:

• Doctrine.php (modified) (1 diff)
• Doctrine/Configurable.php (modified) (1 diff)
• Doctrine/Manager.php (modified) (1 diff)
• Doctrine/Query/Abstract.php (modified) (2 diffs)
• Doctrine/Template/Listener/SoftDelete.php (modified) (1 diff)

branches/0.11/lib/Doctrine.php

@@ -196 +196 @@
     const ATTR_RECURSIVE_MERGE_FIXTURES = 162;
     const ATTR_SINGULARIZE_IMPORT       = 163;
+    const ATTR_USE_DQL_CALLBACKS        = 164;
 
     /**

branches/0.11/lib/Doctrine/Configurable.php

@@ -182 +182 @@
             case Doctrine::ATTR_RECURSIVE_MERGE_FIXTURES;
             case Doctrine::ATTR_SINGULARIZE_IMPORT;
+            case Doctrine::ATTR_USE_DQL_CALLBACKS;
 
                 break;

branches/0.11/lib/Doctrine/Manager.php

@@ -102 +102 @@
                         Doctrine::ATTR_DEFAULT_PARAM_NAMESPACE  => 'doctrine',
                         Doctrine::ATTR_AUTOLOAD_TABLE_CLASSES   => false,
+                        Doctrine::ATTR_USE_DQL_CALLBACKS        => false,
                         ); 
             foreach ($attributes as $attribute => $value) {

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

@@ -1079 +1079 @@
         $this->_preQueried = true;
 
-        $callback = $this->_getDqlCallback();
-
-        // if there is no callback for the query type, then we can return early
-        if ( ! $callback) {
-            return;
-        }
-
-        // parse the FROM clause to find all models used in the DQL
-        $from = new Doctrine_Query_From($this);
-        $this->_components = array();
-        foreach ($this->_dqlParts['from'] as $key => $table) {
-            $componentClause = $from->parse($table, true);
-            foreach ($componentClause as $c) {
-                // remove the prefix if there is one (aka "f.Bar" => "Bar")
-                $component = explode('.', $c[0]);
-                $component = array_pop($component);
-                $alias = isset($c[1]) ? $c[1] : $component;
-                $this->_components[$component] = $alias;
-            }
-        }
-
-        foreach ($this->_components as $component => $alias) {
-            if (class_exists($component)) {
-                $componentObj = Doctrine::getTable($component);
-                $record = $componentObj->getRecordInstance();
+        if (Doctrine_Manager::getInstance()->getAttribute('use_dql_callbacks')) {
+            $callback = $this->_getDqlCallback();
+
+            // if there is no callback for the query type, then we can return early
+            if ( ! $callback) {
+                return;
+            }
+
+            $copy = $this->copy();
+            $copy->getSqlQuery();
+
+            foreach ($copy->getQueryComponents() as $alias => $component) {
+                $table = $component['table'];
+                $record = $table->getRecordInstance();
 
                 // check (and call) preDql*() callback on the model class
@@ -1113 +1102 @@
                 $params = array('component`' => $component, 'alias' => $alias);
                 $event = new Doctrine_Event($record, $callback['const'], $this, $params);
-                $componentObj->getRecordListener()->$callback['callback']($event);
+                $table->getRecordListener()->$callback['callback']($event);
             }
         }

branches/0.11/lib/Doctrine/Template/Listener/SoftDelete.php

@@ -51 +51 @@
     public function __construct(array $options)
     {
+        // Enable dql callbacks since this event listener utilizes them
+        Doctrine_Manager::getInstance()->setAttribute('use_dql_callbacks', true);
+
         $this->_options = $options;
     }