Doctrine

Timestamp:

06/27/08 23:39:41 (12 months ago)

Author:

jwage

Message:

Fixed Doctrine_Record::preDql*() hooks to accept an event just the same as all the other listeners do. This was simply an oversight/mistake in consistancy of the event listener api.

Location:

branches/0.11/lib/Doctrine

Files:

• Query/Abstract.php (modified) (2 diffs)
• Record.php (modified) (1 diff)
• Table.php (modified) (2 diffs)

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

@@ -1003 +1003 @@
         return $result;
     }
-
 
     /**
@@ -1064 +1063 @@
                 $record = $table->getRecordInstance();
 
-                // check (and call) preDql*() callback on the model class
-                if (method_exists($record, $callback['callback'])) {
-                    $record->$callback['callback']($this, $component, $alias);
-                }
-
-                // trigger preDql*() callback event
+                // Trigger preDql*() callback event
                 $params = array('component`' => $component, 'alias' => $alias);
                 $event = new Doctrine_Event($record, $callback['const'], $this, $params);
+
+                $record->$callback['callback']($event);
                 $table->getRecordListener()->$callback['callback']($event);
             }

branches/0.11/lib/Doctrine/Record.php

@@ -384 +384 @@
      */
     public function postInsert($event)
+    { }
+
+    /**
+     * Empty template method to provide Record classes with the ability to alter DQL select
+     * queries at runtime
+     */
+    public function preDqlSelect($event)
+    { }
+
+    /**
+     * Empty template method to provide Record classes with the ability to alter DQL update
+     * queries at runtime
+     */
+    public function preDqlUpdate($event)
+    { }
+
+    /**
+     * Empty template method to provide Record classes with the ability to alter DQL delete
+     * queries at runtime
+     */
+    public function preDqlDelete($event)
     { }
 

branches/0.11/lib/Doctrine/Table.php

@@ -471 +471 @@
 
     /**
-     * Gets the record instance
+     * Gets the record instance for this table. The Doctrine_Table instance always holds at least one
+     * instance of a model so that it can be reused for several things, but primarily it is first
+     * used to instantiate all the internal in memory meta data
      *
      * @return object  Empty instance of the record
@@ -477 +479 @@
     public function getRecordInstance()
     {
+        if ( ! $this->record) {
+            $this->record = new $this->_options['name'];
+        }
         return $this->record;
     }