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

updated plugin classes to use the refactored main class

Browse source
This commit is contained in:
zYne 2007-10-13 16:49:42 +00:00
parent a9e5a35917
commit fa5c28fde0
4 changed files with 36 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/Doctrine/AuditLog.php
View file

@ -96,6 +96,11 @@ class Doctrine_AuditLog extends Doctrine_Plugin
$id = $table->getIdentifier(); $id = $table->getIdentifier();
$options = array('className' => $className); $options = array('className' => $className);
$relations = array($name => array('local' => $local,
'foreign' => $id,
'onDelete' => 'CASCADE',
'onUpdate' => 'CASCADE'));
$this->generateClass($options, $columns, array()); $this->generateClass($options, $columns, array());

2
lib/Doctrine/Plugin.php
View file

@ -118,7 +118,7 @@ class Doctrine_Plugin
unset($def['sequence']); unset($def['sequence']);
unset($def['primary']); unset($def['primary']);
$col = strtolower(Doctrine::tableize($table->getComponentName()) . '_' . $column); $col = $column;
$def['primary'] = true; $def['primary'] = true;
$fk[$col] = $def; $fk[$col] = $def;

46
lib/Doctrine/Search.php
View file

@ -68,13 +68,21 @@ class Doctrine_Search extends Doctrine_Plugin
$name = $record->getTable()->getComponentName(); $name = $record->getTable()->getComponentName();
if ($this->_options['batchUpdates'] === true) { if ($this->_options['batchUpdates'] === true) {
$conn->insert(Doctrine::tableize($class), array('foreign_id' => $id));
$conn = $record->getTable()->getConnection();
$index = new $class();
foreach ($record->identifier() as $id => $value) {
$index->$id = $value;
}
$index->save();
} else { } else {
foreach ($fields as $field) { foreach ($fields as $field) {
$data = $record->get($field); $data = $record->get($field);
$terms = $this->analyze($data); $terms = $this->analyze($data);
foreach ($terms as $pos => $term) { foreach ($terms as $pos => $term) {
$index = new $class(); $index = new $class();
@ -82,7 +90,7 @@ class Doctrine_Search extends Doctrine_Plugin
$index->position = $pos; $index->position = $pos;
$index->field = $field; $index->field = $field;
$index->$name = $record; $index->$name = $record;
$index->save(); $index->save();
} }
} }
@ -144,12 +152,10 @@ class Doctrine_Search extends Doctrine_Plugin
$columns = array('keyword' => array('type' => 'string', $columns = array('keyword' => array('type' => 'string',
'length' => 200, 'length' => 200,
'notnull' => true,
'primary' => true, 'primary' => true,
), ),
'field' => array('type' => 'string', 'field' => array('type' => 'string',
'length' => 50, 'length' => 50,
'notnull' => true,
'primary' => true), 'primary' => true),
'position' => array('type' => 'integer', 'position' => array('type' => 'integer',
'length' => 8, 'length' => 8,
@ -159,34 +165,14 @@ class Doctrine_Search extends Doctrine_Plugin
$id = $table->getIdentifier(); $id = $table->getIdentifier();
$options = array('className' => $className); $options = array('className' => $className);
$fk = array();
foreach ((array) $id as $column) {
$def = $table->getDefinitionOf($column);
unset($def['autoincrement']);
unset($def['sequence']);
unset($def['primary']);
$col = strtolower(Doctrine::tableize($name) . '_' . $column);
$def['primary'] = true;
$fk[$col] = $def;
}
$local = (count($fk) > 1) ? array_keys($fk) : key($fk); $fk = $this->generateForeignKeys($table);
$relations = array($name => array('local' => $local,
'foreign' => $id,
'onDelete' => 'CASCADE',
'onUpdate' => 'CASCADE'));
$columns += $fk; $columns += $fk;
$relations = $this->generateRelation($table, $fk);
$this->generateClass($options, $columns, $relations); $this->generateClass($options, $columns, $relations);
$this->_options['pluginTable'] = $table->getConnection()->getTable($this->_options['className']); $this->_options['pluginTable'] = $table->getConnection()->getTable($this->_options['className']);
return true; return true;

30
lib/Doctrine/Template/Searchable.php
View file

@ -32,32 +32,30 @@
*/ */
class Doctrine_Template_Searchable extends Doctrine_Template class Doctrine_Template_Searchable extends Doctrine_Template
{ {
protected $_search;
public function __construct(array $options) public function __construct(array $options)
{ {
$this->_search = new Doctrine_Search($options); $this->_plugin = new Doctrine_Search($options);
} }
public function getPlugin()
{
return $this->_plugin;
}
public function setUp() public function setUp()
{ {
$id = $this->_table->getIdentifier(); $id = $this->_table->getIdentifier();
$name = $this->_table->getComponentName(); $name = $this->_table->getComponentName();
$className = $this->_search->getOption('className'); $className = $this->_plugin->getOption('className');
if (strpos($className, '%CLASS%') !== false) { if (strpos($className, '%CLASS%') !== false) {
$this->_search->setOption('className', str_replace('%CLASS%', $name, $className)); $this->_plugin->setOption('className', str_replace('%CLASS%', $name, $className));
$className = $this->_search->getOption('className'); $className = $this->_plugin->getOption('className');
} }
$this->_search->buildDefinition($this->_table); $this->_plugin->buildDefinition($this->_table);
foreach ((array) $id as $column) { $this->hasMany($className, array('local' => $id, 'foreign' => $id));
$foreign[] = strtolower(Doctrine::tableize($this->_table->getComponentName()) . '_' . $column);
}
$foreign = (count($foreign) > 1) ? $foreign : current($foreign); $this->addListener(new Doctrine_Search_Listener($this->_plugin));
$this->hasMany($className, array('local' => $id, 'foreign' => $foreign));
$this->addListener(new Doctrine_Search_Listener($this->_search));
} }
} }