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

Browse source
This commit is contained in:
zYne 2007-06-07 18:21:07 +00:00
parent 7bacdf0721
commit cc998bf165
2 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
lib/Doctrine/AuditLog.php
View file

@ -36,7 +36,7 @@ class Doctrine_AuditLog
'deleteTrigger' => '%TABLE%_ddt', 'deleteTrigger' => '%TABLE%_ddt',
'updateTrigger' => '%TABLE%_dut', 'updateTrigger' => '%TABLE%_dut',
'versionTable' => '%TABLE%_dvt', 'versionTable' => '%TABLE%_dvt',
'identifier' => '__version', 'versionColumn' => 'version',
); );
protected $_table; protected $_table;
@ -54,7 +54,7 @@ class Doctrine_AuditLog
public function __get($option) public function __get($option)
{ {
if (isset($this->options[$option])) { if (isset($this->options[$option])) {
return $this->options[$option]; return $this->_options[$option];
} }
return null; return null;
} }
@ -65,7 +65,7 @@ class Doctrine_AuditLog
*/ */
public function __isset($option) public function __isset($option)
{ {
return isset($this->options[$option]); return isset($this->_options[$option]);
} }
/** /**
* getOptions * getOptions
@ -75,7 +75,7 @@ class Doctrine_AuditLog
*/ */
public function getOptions() public function getOptions()
{ {
return $this->options; return $this->_options;
} }
/** /**
* setOption * setOption
@ -92,7 +92,7 @@ class Doctrine_AuditLog
if ( ! isset($this->_options[$name])) { if ( ! isset($this->_options[$name])) {
throw new Doctrine_Exception('Unknown option ' . $name); throw new Doctrine_Exception('Unknown option ' . $name);
} }
$this->options[$name] = $value; $this->_options[$name] = $value;
} }
/** /**
* getOption * getOption
@ -103,8 +103,8 @@ class Doctrine_AuditLog
*/ */
public function getOption($name) public function getOption($name)
{ {
if (isset($this->options[$name])) { if (isset($this->_options[$name])) {
return $this->options[$name]; return $this->_options[$name];
} }
return null; return null;
} }
@ -142,13 +142,6 @@ class Doctrine_AuditLog
} }
$data['columns'] = array_merge(array($this->_options['identifier'] =>
array('type' => 'integer',
'primary' => true,
'length' => 8,
'autoinc' => true)), $data['columns']);
$className = str_replace('%CLASS%', $this->_table->getComponentName(), $this->_options['className']); $className = str_replace('%CLASS%', $this->_table->getComponentName(), $this->_options['className']);
$definition = 'class ' . $className $definition = 'class ' . $className
. ' extends Doctrine_Record { ' . ' extends Doctrine_Record { '
@ -161,10 +154,11 @@ class Doctrine_AuditLog
'foreign' => $this->_table->getIdentifier(), 'foreign' => $this->_table->getIdentifier(),
'type' => Doctrine_Relation::MANY)); 'type' => Doctrine_Relation::MANY));
print $definition;
$this->_table->addListener(new Doctrine_AuditLog_Listener($this));
eval( $definition ); eval( $definition );
$data['options']['primary'] = array($this->_options['identifier']);
$conn->export->createTable($data['tableName'], $data['columns'], $data['options']); $conn->export->createTable($data['tableName'], $data['columns'], $data['options']);
} }

4
lib/Doctrine/Configurable.php
View file

@ -175,7 +175,9 @@ abstract class Doctrine_Configurable
*/ */
public function addListener($listener, $name = null) public function addListener($listener, $name = null)
{ {
if ( ! ($this->attributes[Doctrine::ATTR_LISTENER] instanceof Doctrine_EventListener_Chain)) { if ( ! isset($this->attributes[Doctrine::ATTR_LISTENER]) ||
! ($this->attributes[Doctrine::ATTR_LISTENER] instanceof Doctrine_EventListener_Chain)) {
$this->attributes[Doctrine::ATTR_LISTENER] = new Doctrine_EventListener_Chain(); $this->attributes[Doctrine::ATTR_LISTENER] = new Doctrine_EventListener_Chain();
} }
$this->attributes[Doctrine::ATTR_LISTENER]->add($listener, $name); $this->attributes[Doctrine::ATTR_LISTENER]->add($listener, $name);