RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 05:13:37 +03:00
Code Issues Projects Releases Wiki Activity

fixes #717

Browse source
This commit is contained in:
jwage 2008-01-22 23:50:32 +00:00
parent f9ee88a5c3
commit 4e522ebf6b
2 changed files with 28 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lib/Doctrine/Template/Listener/Timestampable.php
View file

@ -38,7 +38,7 @@ class Doctrine_Template_Listener_Timestampable extends Doctrine_Record_Listener
* @var string * @var string
*/ */
protected $_options = array(); protected $_options = array();
/** /**
* __construct * __construct
* *
@ -49,7 +49,7 @@ class Doctrine_Template_Listener_Timestampable extends Doctrine_Record_Listener
{ {
$this->_options = $options; $this->_options = $options;
} }
/** /**
* preInsert * preInsert
* *
@ -68,7 +68,7 @@ class Doctrine_Template_Listener_Timestampable extends Doctrine_Record_Listener
$event->getInvoker()->$updatedName = $this->getTimestamp('updated'); $event->getInvoker()->$updatedName = $this->getTimestamp('updated');
} }
} }
/** /**
* preUpdate * preUpdate
* *
@ -82,7 +82,7 @@ class Doctrine_Template_Listener_Timestampable extends Doctrine_Record_Listener
$event->getInvoker()->$updatedName = $this->getTimestamp('updated'); $event->getInvoker()->$updatedName = $this->getTimestamp('updated');
} }
} }
/** /**
* getTimestamp * getTimestamp
* *
@ -94,13 +94,17 @@ class Doctrine_Template_Listener_Timestampable extends Doctrine_Record_Listener
public function getTimestamp($type) public function getTimestamp($type)
{ {
$options = $this->_options[$type]; $options = $this->_options[$type];
if ($options['type'] == 'date') { if ($options['expression'] !== false && is_string($options['expression'])) {
return date($options['format'], time()); return new Doctrine_Expression($options['expression']);
} else if ($options['type'] == 'timestamp') {
return date($options['format'], time());
} else { } else {
return time(); if ($options['type'] == 'date') {
return date($options['format'], time());
} else if ($options['type'] == 'timestamp') {
return date($options['format'], time());
} else {
return time();
}
} }
} }
} }

26
lib/Doctrine/Template/Timestampable.php
View file

@ -39,17 +39,19 @@ class Doctrine_Template_Timestampable extends Doctrine_Template
* *
* @var string * @var string
*/ */
protected $_options = array('created' => array('name' => 'created_at', protected $_options = array('created' => array('name' => 'created_at',
'type' => 'timestamp', 'type' => 'timestamp',
'format' => 'Y-m-d H:i:s', 'format' => 'Y-m-d H:i:s',
'disabled' => false, 'disabled' => false,
'options' => array()), 'expression' => false,
'updated' => array('name' => 'updated_at', 'options' => array()),
'type' => 'timestamp', 'updated' => array('name' => 'updated_at',
'format' => 'Y-m-d H:i:s', 'type' => 'timestamp',
'disabled' => false, 'format' => 'Y-m-d H:i:s',
'options' => array())); 'disabled' => false,
'expression' => false,
'options' => array()));
/** /**
* __construct * __construct
* *
@ -60,7 +62,7 @@ class Doctrine_Template_Timestampable extends Doctrine_Template
{ {
$this->_options = Doctrine_Lib::arrayDeepMerge($this->_options, $options); $this->_options = Doctrine_Lib::arrayDeepMerge($this->_options, $options);
} }
/** /**
* setTableDefinition * setTableDefinition
* *