From e3719874bd3234738eb1e8c9e34893540cfec093 Mon Sep 17 00:00:00 2001 From: zYne Date: Wed, 27 Jun 2007 16:59:23 +0000 Subject: [PATCH] --- lib/Doctrine/Record.php | 194 +------------------------- lib/Doctrine/Record/Abstract.php | 227 +++++++++++++++++++++++++++++++ lib/Doctrine/Table.php | 6 +- lib/Doctrine/Template.php | 68 +++++++++ 4 files changed, 304 insertions(+), 191 deletions(-) create mode 100644 lib/Doctrine/Record/Abstract.php create mode 100644 lib/Doctrine/Template.php diff --git a/lib/Doctrine/Record.php b/lib/Doctrine/Record.php index 2a3ff2d7f..127868e52 100644 --- a/lib/Doctrine/Record.php +++ b/lib/Doctrine/Record.php @@ -31,7 +31,7 @@ Doctrine::autoload('Doctrine_Access'); * @since 1.0 * @version $Revision$ */ -abstract class Doctrine_Record extends Doctrine_Access implements Countable, IteratorAggregate, Serializable +abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Countable, IteratorAggregate, Serializable { /** * STATE CONSTANTS @@ -1309,85 +1309,7 @@ abstract class Doctrine_Record extends Doctrine_Access implements Countable, Ite $rel = $this->_table->getRelation($name); $this->_references[$name] = $rel->fetchRelatedFor($this); } - /** - * ownsOne - * binds One-to-One composite relation - * - * @param string $componentName the name of the related component - * @param string $options relation options - * @see Doctrine_Relation::_$definition - * @return Doctrine_Record this object - */ - public function ownsOne() - { - $this->_table->bind(func_get_args(), Doctrine_Relation::ONE_COMPOSITE); - - return $this; - } - /** - * ownsMany - * binds One-to-Many / Many-to-Many composite relation - * - * @param string $componentName the name of the related component - * @param string $options relation options - * @see Doctrine_Relation::_$definition - * @return Doctrine_Record this object - */ - public function ownsMany() - { - $this->_table->bind(func_get_args(), Doctrine_Relation::MANY_COMPOSITE); - return $this; - } - /** - * hasOne - * binds One-to-One aggregate relation - * - * @param string $componentName the name of the related component - * @param string $options relation options - * @see Doctrine_Relation::_$definition - * @return Doctrine_Record this object - */ - public function hasOne() - { - $this->_table->bind(func_get_args(), Doctrine_Relation::ONE_AGGREGATE); - return $this; - } - /** - * hasMany - * binds One-to-Many / Many-to-Many aggregate relation - * - * @param string $componentName the name of the related component - * @param string $options relation options - * @see Doctrine_Relation::_$definition - * @return Doctrine_Record this object - */ - public function hasMany() - { - $this->_table->bind(func_get_args(), Doctrine_Relation::MANY_AGGREGATE); - - return $this; - } - /** - * hasColumn - * sets a column definition - * - * @param string $name - * @param string $type - * @param integer $length - * @param mixed $options - * @return void - */ - public function hasColumn($name, $type, $length = 2147483647, $options = "") - { - $this->_table->setColumn($name, $type, $length, $options); - } - public function hasColumns(array $definitions) - { - foreach ($definitions as $name => $options) { - $this->hasColumn($name, $options['type'], $options['length'], $options); - } - } /** * merge * merges this record with an array of values @@ -1407,117 +1329,6 @@ abstract class Doctrine_Record extends Doctrine_Access implements Countable, Ite } } } - public function setAttribute($attr, $value) - { - $this->_table->setAttribute($attr, $value); - } - public function setTableName($tableName) - { - $this->_table->setOption('tableName', $tableName); - } - public function setInheritanceMap($map) - { - $this->_table->setOption('inheritanceMap', $map); - } - public function setEnumValues($column, $values) - { - $this->_table->setEnumValues($column, $values); - } - /** - * attribute - * sets or retrieves an option - * - * @see Doctrine::ATTR_* constants availible attributes - * @param mixed $attr - * @param mixed $value - * @return mixed - */ - public function attribute($attr, $value) - { - if ($value == null) { - if (is_array($attr)) { - foreach ($attr as $k => $v) { - $this->_table->setAttribute($k, $v); - } - } else { - return $this->_table->getAttribute($attr); - } - } else { - $this->_table->setAttribute($attr, $value); - } - } - /** - * option - * sets or retrieves an option - * - * @see Doctrine_Table::$options availible options - * @param mixed $name the name of the option - * @param mixed $value options value - * @return mixed - */ - public function option($name, $value = null) - { - if ($value == null) { - if (is_array($name)) { - foreach ($name as $k => $v) { - $this->_table->setOption($k, $v); - } - } else { - return $this->_table->getOption($name); - } - } else { - $this->_table->setOption($name, $value); - } - } - /** - * index - * defines or retrieves an index - * if the second parameter is set this method defines an index - * if not this method retrieves index named $name - * - * @param string $name the name of the index - * @param array $definition the definition array - * @return mixed - */ - public function index($name, array $definition = array()) - { - if ( ! $definition) { - return $this->_table->getIndex($name); - } else { - return $this->_table->addIndex($name, $definition); - } - } - /** - * addListener - * - * @param Doctrine_EventListener_Interface|Doctrine_Overloadable $listener - * @return Doctrine_Record - */ - public function addListener($listener, $name = null) - { - $this->_table->addListener($listener, $name = null); - return $this; - } - /** - * getListener - * - * @return Doctrine_EventListener_Interface|Doctrine_Overloadable - */ - public function getListener() - { - return $this->_table->getListener(); - } - /** - * setListener - * - * @param Doctrine_EventListener_Interface|Doctrine_Overloadable $listener - * @return Doctrine_Record - */ - public function setListener($listener) - { - $this->_table->setListener($listener); - return $this; - } /** * call * @@ -1574,6 +1385,9 @@ abstract class Doctrine_Record extends Doctrine_Access implements Countable, Ite */ public function loadTemplate($template) { + $tpl = new $template($this->_table); + $tpl->setUp(); + $tpl->setTableDefinition(); return $this; } /** diff --git a/lib/Doctrine/Record/Abstract.php b/lib/Doctrine/Record/Abstract.php new file mode 100644 index 000000000..c1ec000c9 --- /dev/null +++ b/lib/Doctrine/Record/Abstract.php @@ -0,0 +1,227 @@ +. + */ +Doctrine::autoload('Doctrine_Access'); +/** + * Doctrine_Record_Abstract + * + * @author Konsta Vesterinen + * @license http://www.opensource.org/licenses/lgpl-license.php LGPL + * @package Doctrine + * @category Object Relational Mapping + * @link www.phpdoctrine.com + * @since 1.0 + * @version $Revision$ + */ +abstract class Doctrine_Record_Abstract extends Doctrine_Access +{ + /** + * addListener + * + * @param Doctrine_EventListener_Interface|Doctrine_Overloadable $listener + * @return Doctrine_Record + */ + public function addListener($listener, $name = null) + { + $this->_table->addListener($listener, $name = null); + + return $this; + } + /** + * getListener + * + * @return Doctrine_EventListener_Interface|Doctrine_Overloadable + */ + public function getListener() + { + return $this->_table->getListener(); + } + /** + * setListener + * + * @param Doctrine_EventListener_Interface|Doctrine_Overloadable $listener + * @return Doctrine_Record + */ + public function setListener($listener) + { + $this->_table->setListener($listener); + + return $this; + } + /** + * index + * defines or retrieves an index + * if the second parameter is set this method defines an index + * if not this method retrieves index named $name + * + * @param string $name the name of the index + * @param array $definition the definition array + * @return mixed + */ + public function index($name, array $definition = array()) + { + if ( ! $definition) { + return $this->_table->getIndex($name); + } else { + return $this->_table->addIndex($name, $definition); + } + } + public function setAttribute($attr, $value) + { + $this->_table->setAttribute($attr, $value); + } + public function setTableName($tableName) + { + $this->_table->setOption('tableName', $tableName); + } + public function setInheritanceMap($map) + { + $this->_table->setOption('inheritanceMap', $map); + } + public function setEnumValues($column, $values) + { + $this->_table->setEnumValues($column, $values); + } + /** + * attribute + * sets or retrieves an option + * + * @see Doctrine::ATTR_* constants availible attributes + * @param mixed $attr + * @param mixed $value + * @return mixed + */ + public function attribute($attr, $value) + { + if ($value == null) { + if (is_array($attr)) { + foreach ($attr as $k => $v) { + $this->_table->setAttribute($k, $v); + } + } else { + return $this->_table->getAttribute($attr); + } + } else { + $this->_table->setAttribute($attr, $value); + } + } + /** + * option + * sets or retrieves an option + * + * @see Doctrine_Table::$options availible options + * @param mixed $name the name of the option + * @param mixed $value options value + * @return mixed + */ + public function option($name, $value = null) + { + if ($value == null) { + if (is_array($name)) { + foreach ($name as $k => $v) { + $this->_table->setOption($k, $v); + } + } else { + return $this->_table->getOption($name); + } + } else { + $this->_table->setOption($name, $value); + } + } + /** + * ownsOne + * binds One-to-One composite relation + * + * @param string $componentName the name of the related component + * @param string $options relation options + * @see Doctrine_Relation::_$definition + * @return Doctrine_Record this object + */ + public function ownsOne() + { + $this->_table->bind(func_get_args(), Doctrine_Relation::ONE_COMPOSITE); + + return $this; + } + /** + * ownsMany + * binds One-to-Many / Many-to-Many composite relation + * + * @param string $componentName the name of the related component + * @param string $options relation options + * @see Doctrine_Relation::_$definition + * @return Doctrine_Record this object + */ + public function ownsMany() + { + $this->_table->bind(func_get_args(), Doctrine_Relation::MANY_COMPOSITE); + return $this; + } + /** + * hasOne + * binds One-to-One aggregate relation + * + * @param string $componentName the name of the related component + * @param string $options relation options + * @see Doctrine_Relation::_$definition + * @return Doctrine_Record this object + */ + public function hasOne() + { + $this->_table->bind(func_get_args(), Doctrine_Relation::ONE_AGGREGATE); + + return $this; + } + /** + * hasMany + * binds One-to-Many / Many-to-Many aggregate relation + * + * @param string $componentName the name of the related component + * @param string $options relation options + * @see Doctrine_Relation::_$definition + * @return Doctrine_Record this object + */ + public function hasMany() + { + $this->_table->bind(func_get_args(), Doctrine_Relation::MANY_AGGREGATE); + + return $this; + } + /** + * hasColumn + * sets a column definition + * + * @param string $name + * @param string $type + * @param integer $length + * @param mixed $options + * @return void + */ + public function hasColumn($name, $type, $length = 2147483647, $options = "") + { + $this->_table->setColumn($name, $type, $length, $options); + } + public function hasColumns(array $definitions) + { + foreach ($definitions as $name => $options) { + $this->hasColumn($name, $options['type'], $options['length'], $options); + } + } +} diff --git a/lib/Doctrine/Table.php b/lib/Doctrine/Table.php index 30e72535c..cca9f1df4 100644 --- a/lib/Doctrine/Table.php +++ b/lib/Doctrine/Table.php @@ -509,6 +509,10 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable $options = array(); $options['type'] = $type; + if ( ! isset($args[1])) { + $args[1] = array(); + } + // the following is needed for backwards compatibility if (is_string($args[1])) { if ( ! isset($args[2])) { @@ -539,7 +543,7 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable $options = array_merge($args[2], $options); $this->_parser->bind($args[0], $options); - } else { + } else { $options = array_merge($args[1], $options); $this->_parser->bind($args[0], $options); } diff --git a/lib/Doctrine/Template.php b/lib/Doctrine/Template.php new file mode 100644 index 000000000..4818faed5 --- /dev/null +++ b/lib/Doctrine/Template.php @@ -0,0 +1,68 @@ +. + */ + +/** + * Doctrine_Template + * + * @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 + */ +class Doctrine_Template extends Doctrine_Record_Abstract +{ + /** + * @param Doctrine_Table $_table reference to associated Doctrine_Table instance + */ + protected $_table; + /** + * constructor, creates tree with reference to table and any options + * + * @param Doctrine_Table $_table the table object this Template belongs to + */ + public function __construct(Doctrine_Table $table) + { + $this->_table = $table; + } + /** + * getTable + * returns the associated table object + * + * @return Doctrine_Table the associated table object + */ + public function getTable() + { + return $this->_table; + } + + public function setUp() + { + + } + + public function setTableDefinition() + { + + } +}