From 1fac496fc193ae90464d8e5839c74b13118b78ad Mon Sep 17 00:00:00 2001
From: Will Atwood Mitchell <wamitchell@gmail.com>
Date: Tue, 19 Jul 2011 01:10:05 -0400
Subject: [PATCH] Modified Timestampable Listener to use column alias if provided

---
 lib/Doctrine/Template/Listener/Timestampable.php |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/Doctrine/Template/Listener/Timestampable.php b/lib/Doctrine/Template/Listener/Timestampable.php
index 3bad00b..18952ee 100644
--- a/lib/Doctrine/Template/Listener/Timestampable.php
+++ b/lib/Doctrine/Template/Listener/Timestampable.php
@@ -60,7 +60,8 @@ class Doctrine_Template_Listener_Timestampable extends Doctrine_Record_Listener
     public function preInsert(Doctrine_Event $event)
     {
         if ( ! $this->_options['created']['disabled']) {
-            $createdName = $event->getInvoker()->getTable()->getFieldName($this->_options['created']['name']);
+            $name = ($this->_options['created']['alias']) ? $this->_options['created']['alias'] : $this->_options['created']['name'];
+            $createdName = $event->getInvoker()->getTable()->getFieldName($name);
             $modified = $event->getInvoker()->getModified();
             if ( ! isset($modified[$createdName])) {
                 $event->getInvoker()->$createdName = $this->getTimestamp('created', $event->getInvoker()->getTable()->getConnection());
@@ -68,7 +69,8 @@ class Doctrine_Template_Listener_Timestampable extends Doctrine_Record_Listener
         }
 
         if ( ! $this->_options['updated']['disabled'] && $this->_options['updated']['onInsert']) {
-            $updatedName = $event->getInvoker()->getTable()->getFieldName($this->_options['updated']['name']);
+            $name = ($this->_options['updated']['alias']) ? $this->_options['updated']['alias'] : $this->_options['updated']['name'];
+            $updatedName = $event->getInvoker()->getTable()->getFieldName($name);
             $modified = $event->getInvoker()->getModified();
             if ( ! isset($modified[$updatedName])) {
                 $event->getInvoker()->$updatedName = $this->getTimestamp('updated', $event->getInvoker()->getTable()->getConnection());
@@ -85,7 +87,8 @@ class Doctrine_Template_Listener_Timestampable extends Doctrine_Record_Listener
     public function preUpdate(Doctrine_Event $event)
     {
         if ( ! $this->_options['updated']['disabled']) {
-            $updatedName = $event->getInvoker()->getTable()->getFieldName($this->_options['updated']['name']);
+            $name = ($this->_options['updated']['alias']) ? $this->_options['updated']['alias'] : $this->_options['updated']['name'];
+            $updatedName = $event->getInvoker()->getTable()->getFieldName($name);
             $modified = $event->getInvoker()->getModified();
             if ( ! isset($modified[$updatedName])) {
                 $event->getInvoker()->$updatedName = $this->getTimestamp('updated', $event->getInvoker()->getTable()->getConnection());
@@ -103,7 +106,8 @@ class Doctrine_Template_Listener_Timestampable extends Doctrine_Record_Listener
     {
         if ( ! $this->_options['updated']['disabled']) {
             $params = $event->getParams();
-            $updatedName = $event->getInvoker()->getTable()->getFieldName($this->_options['updated']['name']);
+            $name = ($this->_options['updated']['alias']) ? $this->_options['updated']['alias'] : $this->_options['updated']['name'];
+            $updatedName = $event->getInvoker()->getTable()->getFieldName($name);
             $field = $params['alias'] . '.' . $updatedName;
             $query = $event->getQuery();
 
-- 
1.7.3.4