From b13a70c08778104b0d2e3cc8e4cca67de56851b3 Mon Sep 17 00:00:00 2001
From: zYne <zYne@625475ce-881a-0410-a577-b389adb331d8>
Date: Wed, 18 Jul 2007 19:18:30 +0000
Subject: [PATCH]
---
lib/Doctrine/AuditLog.php | 10 +++---
lib/Doctrine/AuditLog/Listener.php | 9 ++++-
lib/Doctrine/Template/Versionable.php | 51 +++++++++++++++++++++++++++
3 files changed, 64 insertions(+), 6 deletions(-)
create mode 100644 lib/Doctrine/Template/Versionable.php
diff --git a/lib/Doctrine/AuditLog.php b/lib/Doctrine/AuditLog.php
index 3f574baf5..5044327a9 100644
--- a/lib/Doctrine/AuditLog.php
+++ b/lib/Doctrine/AuditLog.php
@@ -43,10 +43,6 @@ class Doctrine_AuditLog
public function __construct($options)
{
$this->_options = array_merge($this->_options, $options);
-
- $this->_options['className'] = str_replace('%CLASS%',
- $this->_options['table']->getComponentName(),
- $this->_options['className']);
}
/**
* __get
@@ -133,7 +129,11 @@ class Doctrine_AuditLog
return $q->execute($values, Doctrine_HYDRATE::HYDRATE_ARRAY);
}
public function buildDefinition(Doctrine_Table $table)
- {
+ {
+ $this->_options['className'] = str_replace('%CLASS%',
+ $this->_options['table']->getComponentName(),
+ $this->_options['className']);
+
$name = $table->getComponentName();
$className = $name . 'Version';
diff --git a/lib/Doctrine/AuditLog/Listener.php b/lib/Doctrine/AuditLog/Listener.php
index ff3ed9a01..0405393ab 100644
--- a/lib/Doctrine/AuditLog/Listener.php
+++ b/lib/Doctrine/AuditLog/Listener.php
@@ -52,6 +52,7 @@ class Doctrine_AuditLog_Listener extends Doctrine_Record_Listener
$version = new $class();
$version->merge($record->toArray());
+ $version->save();
$versionColumn = $this->_auditLog->getOption('versionColumn');
$version = $record->get($versionColumn);
@@ -60,8 +61,14 @@ class Doctrine_AuditLog_Listener extends Doctrine_Record_Listener
}
public function preUpdate(Doctrine_Event $event)
{
+ $class = $this->_auditLog->getOption('className');
+ $record = $event->getInvoker();
+
+ $version = new $class();
+ $version->merge($record->toArray());
+ $version->save();
+
$versionColumn = $this->_auditLog->getOption('versionColumn');
- $record = $event->getInvoker();
$version = $record->get($versionColumn);
diff --git a/lib/Doctrine/Template/Versionable.php b/lib/Doctrine/Template/Versionable.php
new file mode 100644
index 000000000..8a94582be
--- /dev/null
+++ b/lib/Doctrine/Template/Versionable.php
@@ -0,0 +1,51 @@
+<?php
+/*
+ * $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.phpdoctrine.com>.
+ */
+/**
+ * Doctrine_Template_Versionable
+ *
+ * @package Doctrine
+ * @license http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category Object Relational Mapping
+ * @link www.phpdoctrine.com
+ * @since 1.0
+ * @version $Revision$
+ * @author Konsta Vesterinen <kvesteri@cc.hut.fi>
+ */
+class Doctrine_Template_Versionable extends Doctrine_Template
+{
+ protected $_auditLog;
+
+ public function __construct(array $options)
+ {
+ $this->_auditLog = new Doctrine_AuditLog($options);
+ }
+ public function setUp()
+ {
+ $this->_auditLog->setOption('table', $this->_table);
+ $this->_auditLog->buildDefinition($this->_table);
+
+ $this->addListener(new Doctrine_AuditLog_Listener($this->_auditLog));
+ }
+ public function getAuditLog()
+ {
+ return $this->_auditLog;
+ }
+}