Skip to content

D
doctrine-dbal
Commit 71ed9242 authored by romanb's avatar romanb
Browse files
Options

refactorings

parent d3a26152
Show whitespace changes
Inline Side-by-side
Showing with 540 additions and 1711 deletions
lib/Doctrine.php
View file @ 71ed9242
...@@ -55,7 +55,7 @@ final class Doctrine ...@@ -55,7 +55,7 @@ final class Doctrine
/** /**
* VERSION * VERSION
*/ */
const VERSION = '1.0.0'; const VERSION = '2.0.0';
/** /**
* ERROR CONSTANTS * ERROR CONSTANTS
...@@ -171,46 +171,48 @@ final class Doctrine ...@@ -171,46 +171,48 @@ final class Doctrine
* Doctrine constants * Doctrine constants
*/ */
const ATTR_LISTENER = 100; const ATTR_LISTENER = 100;
const ATTR_QUOTE_IDENTIFIER = 101; const ATTR_QUOTE_IDENTIFIER = 101; // manager/session attribute
const ATTR_FIELD_CASE = 102; const ATTR_FIELD_CASE = 102; // manager/session attribute
const ATTR_IDXNAME_FORMAT = 103; const ATTR_IDXNAME_FORMAT = 103; // manager/session attribute
const ATTR_SEQNAME_FORMAT = 104; const ATTR_SEQNAME_FORMAT = 104; // manager/session attribute
const ATTR_SEQCOL_NAME = 105; const ATTR_SEQCOL_NAME = 105; // class attribute
const ATTR_CMPNAME_FORMAT = 118; const ATTR_CMPNAME_FORMAT = 118; // ??
const ATTR_DBNAME_FORMAT = 117; const ATTR_DBNAME_FORMAT = 117; // manager/session attribute
const ATTR_TBLCLASS_FORMAT = 119; const ATTR_TBLCLASS_FORMAT = 119; // manager/session attribute
const ATTR_TBLNAME_FORMAT = 120; const ATTR_TBLNAME_FORMAT = 120; // manager/session attribute
const ATTR_EXPORT = 140; const ATTR_EXPORT = 140; // manager/session attribute
const ATTR_DECIMAL_PLACES = 141; const ATTR_DECIMAL_PLACES = 141; // manager/session attribute
const ATTR_PORTABILITY = 106; const ATTR_PORTABILITY = 106; // manager/session attribute
const ATTR_VALIDATE = 107; const ATTR_VALIDATE = 107; // manager/session attribute
const ATTR_COLL_KEY = 108; const ATTR_COLL_KEY = 108; // class attribute
const ATTR_QUERY_LIMIT = 109; const ATTR_QUERY_LIMIT = 109; // manager/session attribute
const ATTR_DEFAULT_TABLE_TYPE = 112; const ATTR_DEFAULT_TABLE_TYPE = 112; // manager/session attribute
const ATTR_DEF_TEXT_LENGTH = 113; const ATTR_DEF_TEXT_LENGTH = 113; // manager/session attribute
const ATTR_DEF_VARCHAR_LENGTH = 114; const ATTR_DEF_VARCHAR_LENGTH = 114; // manager/session attribute
const ATTR_DEF_TABLESPACE = 115; const ATTR_DEF_TABLESPACE = 115; // manager/session attribute
const ATTR_EMULATE_DATABASE = 116; const ATTR_EMULATE_DATABASE = 116; // manager/session attribute
const ATTR_USE_NATIVE_ENUM = 117; const ATTR_USE_NATIVE_ENUM = 117; // manager/session attribute
const ATTR_DEFAULT_SEQUENCE = 133; const ATTR_DEFAULT_SEQUENCE = 133; // ??
const ATTR_FETCHMODE = 118; const ATTR_FETCHMODE = 118; // deprecated
const ATTR_NAME_PREFIX = 121; const ATTR_NAME_PREFIX = 121; // ??
const ATTR_CREATE_TABLES = 122; const ATTR_CREATE_TABLES = 122; // manager/session attribute
const ATTR_COLL_LIMIT = 123; const ATTR_COLL_LIMIT = 123; // manager/session attribute
const ATTR_CACHE = 150; const ATTR_CACHE = 150; // deprecated
const ATTR_RESULT_CACHE = 150; const ATTR_RESULT_CACHE = 150; // manager/session attribute
const ATTR_CACHE_LIFESPAN = 151; const ATTR_CACHE_LIFESPAN = 151; // deprecated
const ATTR_RESULT_CACHE_LIFESPAN = 151; const ATTR_RESULT_CACHE_LIFESPAN = 151; // manager/session attribute
const ATTR_LOAD_REFERENCES = 153; const ATTR_LOAD_REFERENCES = 153; // class attribute
const ATTR_RECORD_LISTENER = 154; const ATTR_RECORD_LISTENER = 154;
const ATTR_THROW_EXCEPTIONS = 155; const ATTR_THROW_EXCEPTIONS = 155; // manager/session attribute
const ATTR_DEFAULT_PARAM_NAMESPACE = 156; const ATTR_DEFAULT_PARAM_NAMESPACE = 156; // ??
const ATTR_QUERY_CACHE = 157; const ATTR_QUERY_CACHE = 157; // manager/session attribute
const ATTR_QUERY_CACHE_LIFESPAN = 158; const ATTR_QUERY_CACHE_LIFESPAN = 158; // manager/session attribute
const ATTR_MODEL_LOADING = 161; const ATTR_MODEL_LOADING = 161; // manager/session attribute
const ATTR_LOCK = 162; const ATTR_LOCK = 162; // ??
const ATTR_HYDRATE = 163; const ATTR_HYDRATE = 163; // ??
const ATTR_IDENTIFIER = 164; const ATTR_IDENTIFIER = 164; // ??
const ATTR_METADATA_CACHE = 165; // manager/session attribute
const ATTR_METADATA_CACHE_LIFESPAN = 166; // manager/session attribute
/** /**
* QUERY_LIMIT CONSTANTS * QUERY_LIMIT CONSTANTS
...@@ -281,6 +283,7 @@ final class Doctrine ...@@ -281,6 +283,7 @@ final class Doctrine
* FETCHMODE_VHOLDER * FETCHMODE_VHOLDER
* *
* @see self::ATTR_FETCHMODE * @see self::ATTR_FETCHMODE
* @deprecated???
*/ */
const FETCHMODE_VHOLDER = 1; const FETCHMODE_VHOLDER = 1;
...@@ -293,6 +296,7 @@ final class Doctrine ...@@ -293,6 +296,7 @@ final class Doctrine
* This is the default fetchmode. * This is the default fetchmode.
* *
* @see self::ATTR_FETCHMODE * @see self::ATTR_FETCHMODE
* @deprecated???
*/ */
const FETCHMODE_RECORD = 2; const FETCHMODE_RECORD = 2;
...@@ -300,6 +304,7 @@ final class Doctrine ...@@ -300,6 +304,7 @@ final class Doctrine
* FETCHMODE_ARRAY * FETCHMODE_ARRAY
* *
* @see self::ATTR_FETCHMODE * @see self::ATTR_FETCHMODE
* @deprecated???
*/ */
const FETCHMODE_ARRAY = 3; const FETCHMODE_ARRAY = 3;
...@@ -493,6 +498,7 @@ final class Doctrine ...@@ -493,6 +498,7 @@ final class Doctrine
* VALIDATE_CONSTRAINTS * VALIDATE_CONSTRAINTS
* *
* @see self::ATTR_VALIDATE * @see self::ATTR_VALIDATE
* Not used? Purpose?
*/ */
const VALIDATE_CONSTRAINTS = 4; const VALIDATE_CONSTRAINTS = 4;
...@@ -557,7 +563,7 @@ final class Doctrine ...@@ -557,7 +563,7 @@ final class Doctrine
* *
* @see self::ATTR_MODEL_LOADING * @see self::ATTR_MODEL_LOADING
*/ */
const MODEL_LOADING_CONSERVATIVE= 2; const MODEL_LOADING_CONSERVATIVE = 2;
/** /**
* INHERITANCE TYPE CONSTANTS. * INHERITANCE TYPE CONSTANTS.
...@@ -763,8 +769,7 @@ final class Doctrine ...@@ -763,8 +769,7 @@ final class Doctrine
// - not a subclass of Doctrine_Record // - not a subclass of Doctrine_Record
// - don't have a setTableDefinition method // - don't have a setTableDefinition method
if (!$class->isAbstract() && if (!$class->isAbstract() &&
$class->isSubClassOf('Doctrine_Record') && $class->isSubClassOf('Doctrine_Record')) {
$class->hasMethod('setTableDefinition')) {
return true; return true;
} }
......
lib/Doctrine/ClassMetadata.php
View file @ 71ed9242
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
*/ */
/** /**
* A <tt>ClassMetadata</tt> instance holds all the information (metadata) of an entity and it's relations. * A <tt>ClassMetadata</tt> instance holds all the information (metadata) of an entity and
* These informations are used for the proper object-relational mapping of the class. * it's associations and how they're mapped to the relational model.
* *
* @package Doctrine * @package Doctrine
* @subpackage ClassMetadata * @subpackage ClassMetadata
...@@ -48,6 +48,7 @@ class Doctrine_ClassMetadata extends Doctrine_Configurable implements Serializab ...@@ -48,6 +48,7 @@ class Doctrine_ClassMetadata extends Doctrine_Configurable implements Serializab
/** /**
* The name of the custom mapper class used for the entity class. * The name of the custom mapper class used for the entity class.
* (Optional).
* *
* @var string * @var string
*/ */
...@@ -60,7 +61,7 @@ class Doctrine_ClassMetadata extends Doctrine_Configurable implements Serializab ...@@ -60,7 +61,7 @@ class Doctrine_ClassMetadata extends Doctrine_Configurable implements Serializab
protected $_conn; protected $_conn;
/** /**
* The names of the parent classes. * The names of the parent classes (ancestors).
*/ */
protected $_parentClasses = array(); protected $_parentClasses = array();
...@@ -75,7 +76,7 @@ class Doctrine_ClassMetadata extends Doctrine_Configurable implements Serializab ...@@ -75,7 +76,7 @@ class Doctrine_ClassMetadata extends Doctrine_Configurable implements Serializab
/** /**
* The identifier type of the class. * The identifier type of the class.
* *
* @see Doctrine_Identifier constants * @see Doctrine::IDENTIFIER_* constants
* @var integer * @var integer
*/ */
protected $_identifierType; protected $_identifierType;
...@@ -83,6 +84,7 @@ class Doctrine_ClassMetadata extends Doctrine_Configurable implements Serializab ...@@ -83,6 +84,7 @@ class Doctrine_ClassMetadata extends Doctrine_Configurable implements Serializab
/** /**
* The inheritance mapping type used by the class. * The inheritance mapping type used by the class.
* *
*
* @var integer * @var integer
*/ */
protected $_inheritanceType = Doctrine::INHERITANCETYPE_TABLE_PER_CLASS; protected $_inheritanceType = Doctrine::INHERITANCETYPE_TABLE_PER_CLASS;
...@@ -115,9 +117,9 @@ class Doctrine_ClassMetadata extends Doctrine_Configurable implements Serializab ...@@ -115,9 +117,9 @@ class Doctrine_ClassMetadata extends Doctrine_Configurable implements Serializab
/** /**
* The mapped columns and their mapping definitions. * The mapped columns and their mapping definitions.
* Keys are column names and values are definitions. * Keys are column names and values are mapping definitions.
* *
* The definition array has atleast the following values: * The mapping definition array has at least the following values:
* *
* -- type the column type, eg. 'integer' * -- type the column type, eg. 'integer'
* -- length the column length, eg. 11 * -- length the column length, eg. 11
...@@ -156,11 +158,6 @@ class Doctrine_ClassMetadata extends Doctrine_Configurable implements Serializab ...@@ -156,11 +158,6 @@ class Doctrine_ClassMetadata extends Doctrine_Configurable implements Serializab
*/ */
protected $_enumValues = array(); protected $_enumValues = array();
/**
* @todo Implementation.
*/
protected $_readOnlyFieldNames = array();
/** /**
* Tree object associated with the class. * Tree object associated with the class.
* *
...@@ -219,8 +216,10 @@ class Doctrine_ClassMetadata extends Doctrine_Configurable implements Serializab ...@@ -219,8 +216,10 @@ class Doctrine_ClassMetadata extends Doctrine_Configurable implements Serializab
* Inheritance options. * Inheritance options.
*/ */
protected $_inheritanceOptions = array( protected $_inheritanceOptions = array(
// JOINED & TABLE_PER_CLASS options
'discriminatorColumn' => null, 'discriminatorColumn' => null,
'discriminatorMap' => array(), 'discriminatorMap' => array(),
// JOINED options
'joinSubclasses' => true 'joinSubclasses' => true
); );
...@@ -261,9 +260,9 @@ class Doctrine_ClassMetadata extends Doctrine_Configurable implements Serializab ...@@ -261,9 +260,9 @@ class Doctrine_ClassMetadata extends Doctrine_Configurable implements Serializab
/** /**
* Constructs a new metadata instance. * Constructs a new ClassMetadata instance.
* *
* @param string $domainClassName Name of the class the metadata instance is used for. * @param string $entityName Name of the entity class the metadata info is used for.
*/ */
public function __construct($entityName, Doctrine_Connection $conn) public function __construct($entityName, Doctrine_Connection $conn)
{ {
...@@ -272,7 +271,7 @@ class Doctrine_ClassMetadata extends Doctrine_Configurable implements Serializab ...@@ -272,7 +271,7 @@ class Doctrine_ClassMetadata extends Doctrine_Configurable implements Serializab
$this->_conn = $conn; $this->_conn = $conn;
$this->_parser = new Doctrine_Relation_Parser($this); $this->_parser = new Doctrine_Relation_Parser($this);
$this->_filters[] = new Doctrine_Record_Filter_Standard(); $this->_filters[] = new Doctrine_Record_Filter_Standard();
$this->setParent($this->_conn); $this->setConfigurableParent($this->_conn);
} }
/** /**
...@@ -286,13 +285,20 @@ class Doctrine_ClassMetadata extends Doctrine_Configurable implements Serializab ...@@ -286,13 +285,20 @@ class Doctrine_ClassMetadata extends Doctrine_Configurable implements Serializab
/** /**
* getComponentName * getComponentName
* *
* @return void * @return string
*/ */
public function getClassName() public function getClassName()
{ {
return $this->_entityName; return $this->_entityName;
} }
/**
* Gets the name of the root class of the entity hierarchy. If the entity described
* by the ClassMetadata is not participating in a hierarchy, this is the same as the
* name returned by {@link getClassName()}.
*
* @return string
*/
public function getRootClassName() public function getRootClassName()
{ {
return $this->_rootEntityName; return $this->_rootEntityName;
...@@ -315,7 +321,7 @@ class Doctrine_ClassMetadata extends Doctrine_Configurable implements Serializab ...@@ -315,7 +321,7 @@ class Doctrine_ClassMetadata extends Doctrine_Configurable implements Serializab
*/ */
public function isIdentifier($fieldName) public function isIdentifier($fieldName)
{ {
return in_array($fieldName, (array)$this->getIdentifier()); return in_array($fieldName, $this->getIdentifier());
} }
/** /**
...@@ -353,10 +359,11 @@ class Doctrine_ClassMetadata extends Doctrine_Configurable implements Serializab ...@@ -353,10 +359,11 @@ class Doctrine_ClassMetadata extends Doctrine_Configurable implements Serializab
* @param string $name the name of the option to set * @param string $name the name of the option to set
* @param mixed $value the value of the option * @param mixed $value the value of the option
* @return Doctrine_Table this object * @return Doctrine_Table this object
* @deprecated
*/ */
public function setOption($name, $value) public function setOption($name, $value)
{ {
switch ($name) { /*switch ($name) {
case 'tableName': case 'tableName':
case 'index': case 'index':
case 'sequenceName': case 'sequenceName':
...@@ -368,7 +375,7 @@ class Doctrine_ClassMetadata extends Doctrine_Configurable implements Serializab ...@@ -368,7 +375,7 @@ class Doctrine_ClassMetadata extends Doctrine_Configurable implements Serializab
case 'enumMap': case 'enumMap':
$this->_enumMap = $value; $this->_enumMap = $value;
return; return;
} }*/
$this->_options[$name] = $value; $this->_options[$name] = $value;
} }
...@@ -457,11 +464,8 @@ class Doctrine_ClassMetadata extends Doctrine_Configurable implements Serializab ...@@ -457,11 +464,8 @@ class Doctrine_ClassMetadata extends Doctrine_Configurable implements Serializab
*/ */
public function getColumnName($fieldName) public function getColumnName($fieldName)
{ {
if (isset($this->_columnNames[$fieldName])) { return isset($this->_columnNames[$fieldName]) ?
return $this->_columnNames[$fieldName]; $this->_columnNames[$fieldName] : $fieldName;
}
return $fieldName;
} }
/** /**
...@@ -481,21 +485,21 @@ class Doctrine_ClassMetadata extends Doctrine_Configurable implements Serializab ...@@ -481,21 +485,21 @@ class Doctrine_ClassMetadata extends Doctrine_Configurable implements Serializab
/** /**
* getFieldName * getFieldName
* *
* returns a column alias for a column name * returns the field name for a column name
* if no alias can be found the column name is returned. * if no field name can be found the column name is returned.
* *
* @param string $columnName column name * @param string $columnName column name
* @return string column alias * @return string column alias
*/ */
public function getFieldName($columnName) public function getFieldName($columnName)
{ {
if (isset($this->_fieldNames[$columnName])) { return isset($this->_fieldNames[$columnName]) ?
return $this->_fieldNames[$columnName]; $this->_fieldNames[$columnName] : $columnName;
}
return $columnName;
} }
/**
* @deprecated
*/
public function setColumns(array $definitions) public function setColumns(array $definitions)
{ {
foreach ($definitions as $name => $options) { foreach ($definitions as $name => $options) {
...@@ -1793,6 +1797,21 @@ class Doctrine_ClassMetadata extends Doctrine_Configurable implements Serializab ...@@ -1793,6 +1797,21 @@ class Doctrine_ClassMetadata extends Doctrine_Configurable implements Serializab
return $this; return $this;
} }
public function hasAttribute($key)
{
switch ($key) {
case Doctrine::ATTR_SEQCOL_NAME:
case Doctrine::ATTR_COLL_KEY:
case Doctrine::ATTR_LOAD_REFERENCES:
case Doctrine::ATTR_EXPORT:
case Doctrine::ATTR_QUERY_LIMIT:
case Doctrine::ATTR_VALIDATE:
return true;
default:
return false;
}
}
/** /**
* *
......
lib/Doctrine/Collection.php
View file @ 71ed9242
...@@ -20,9 +20,9 @@ ...@@ -20,9 +20,9 @@
*/ */
Doctrine::autoload('Doctrine_Access'); Doctrine::autoload('Doctrine_Access');
/** /**
* A Doctrine_Collection represents a collection of record objects. * A Doctrine_Collection represents a collection of entities.
* A collection object is strongly typed in the sense that it can only contain * A collection object is strongly typed in the sense that it can only contain
* records of a specific type or one it's subtypes. * entities of a specific type or one it's subtypes.
* *
* @package Doctrine * @package Doctrine
* @subpackage Collection * @subpackage Collection
...@@ -113,7 +113,7 @@ class Doctrine_Collection extends Doctrine_Access implements Countable, Iterator ...@@ -113,7 +113,7 @@ class Doctrine_Collection extends Doctrine_Access implements Countable, Iterator
} }
if ($keyColumn === null) { if ($keyColumn === null) {
$keyColumn = $mapper->getAttribute(Doctrine::ATTR_COLL_KEY); $keyColumn = $mapper->getClassMetadata()->getAttribute(Doctrine::ATTR_COLL_KEY);
} }
if ($keyColumn !== null) { if ($keyColumn !== null) {
......
lib/Doctrine/Configurable.php
View file @ 71ed9242
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
/** /**
* Doctrine_Configurable * Doctrine_Configurable
* the base for Doctrine_Table, Doctrine_Manager and Doctrine_Connection
* *
* *
* @package Doctrine * @package Doctrine
...@@ -37,7 +36,7 @@ abstract class Doctrine_Configurable extends Doctrine_Locator_Injectable ...@@ -37,7 +36,7 @@ abstract class Doctrine_Configurable extends Doctrine_Locator_Injectable
/** /**
* @var array $attributes an array of containing all attributes * @var array $attributes an array of containing all attributes
*/ */
protected $attributes = array(); protected $_attributes = array();
/** /**
* @var Doctrine_Configurable $parent the parent of this component * @var Doctrine_Configurable $parent the parent of this component
...@@ -49,12 +48,12 @@ abstract class Doctrine_Configurable extends Doctrine_Locator_Injectable ...@@ -49,12 +48,12 @@ abstract class Doctrine_Configurable extends Doctrine_Locator_Injectable
* keys as template names and values as names of the concrete * keys as template names and values as names of the concrete
* implementation classes * implementation classes
*/ */
protected $_impl = array(); //protected $_impl = array();
/** /**
* @var array $_params an array of user defined parameters * @var array $_params an array of user defined parameters
*/ */
protected $_params = array(); //protected $_params = array();
/** /**
* setAttribute * setAttribute
...@@ -88,7 +87,6 @@ abstract class Doctrine_Configurable extends Doctrine_Locator_Injectable ...@@ -88,7 +87,6 @@ abstract class Doctrine_Configurable extends Doctrine_Locator_Injectable
if (defined($const)) { if (defined($const)) {
$attribute = constant($const); $attribute = constant($const);
$this->_state = $attribute;
} else { } else {
throw new Doctrine_Exception('Unknown attribute: "' . $attribute . '"'); throw new Doctrine_Exception('Unknown attribute: "' . $attribute . '"');
} }
...@@ -105,12 +103,12 @@ abstract class Doctrine_Configurable extends Doctrine_Locator_Injectable ...@@ -105,12 +103,12 @@ abstract class Doctrine_Configurable extends Doctrine_Locator_Injectable
} }
switch ($attribute) { switch ($attribute) {
case Doctrine::ATTR_FETCHMODE: case Doctrine::ATTR_FETCHMODE: // deprecated
throw new Doctrine_Exception('Deprecated attribute. See http://www.phpdoctrine.org/documentation/manual?chapter=configuration'); throw new Doctrine_Exception('Deprecated attribute. See http://www.phpdoctrine.org/documentation/manual?chapter=configuration');
case Doctrine::ATTR_LISTENER: case Doctrine::ATTR_LISTENER:
$this->setEventListener($value); $this->setEventListener($value);
break; break;
case Doctrine::ATTR_COLL_KEY: case Doctrine::ATTR_COLL_KEY: // class attribute
if ( ! ($this instanceof Doctrine_ClassMetadata)) { if ( ! ($this instanceof Doctrine_ClassMetadata)) {
throw new Doctrine_Exception("This attribute can only be set at class level."); throw new Doctrine_Exception("This attribute can only be set at class level.");
} }
...@@ -118,58 +116,58 @@ abstract class Doctrine_Configurable extends Doctrine_Locator_Injectable ...@@ -118,58 +116,58 @@ abstract class Doctrine_Configurable extends Doctrine_Locator_Injectable
throw new Doctrine_Exception("Couldn't set collection key attribute. No such field '$value'"); throw new Doctrine_Exception("Couldn't set collection key attribute. No such field '$value'");
} }
break; break;
case Doctrine::ATTR_CACHE: case Doctrine::ATTR_CACHE: // deprecated
case Doctrine::ATTR_RESULT_CACHE: case Doctrine::ATTR_RESULT_CACHE:// manager/session attribute
case Doctrine::ATTR_QUERY_CACHE: case Doctrine::ATTR_QUERY_CACHE: // manager/session attribute
if ($value !== null) { if ($value !== null) {
if ( ! ($value instanceof Doctrine_Cache_Interface)) { if ( ! ($value instanceof Doctrine_Cache_Interface)) {
throw new Doctrine_Exception('Cache driver should implement Doctrine_Cache_Interface'); throw new Doctrine_Exception('Cache driver should implement Doctrine_Cache_Interface');
} }
} }
break; break;
case Doctrine::ATTR_VALIDATE: case Doctrine::ATTR_VALIDATE: // manager/session attribute
case Doctrine::ATTR_QUERY_LIMIT: case Doctrine::ATTR_QUERY_LIMIT: // manager/session attribute
case Doctrine::ATTR_QUOTE_IDENTIFIER: case Doctrine::ATTR_QUOTE_IDENTIFIER: // manager/session attribute
case Doctrine::ATTR_PORTABILITY: case Doctrine::ATTR_PORTABILITY: // manager/session attribute
case Doctrine::ATTR_DEFAULT_TABLE_TYPE: case Doctrine::ATTR_DEFAULT_TABLE_TYPE: // manager/session attribute
case Doctrine::ATTR_EMULATE_DATABASE: case Doctrine::ATTR_EMULATE_DATABASE: // manager/session attribute
case Doctrine::ATTR_USE_NATIVE_ENUM: case Doctrine::ATTR_USE_NATIVE_ENUM: // manager/session attribute
case Doctrine::ATTR_DEFAULT_SEQUENCE: case Doctrine::ATTR_DEFAULT_SEQUENCE: // ??
case Doctrine::ATTR_EXPORT: case Doctrine::ATTR_EXPORT: // manager/session attribute
case Doctrine::ATTR_DECIMAL_PLACES: case Doctrine::ATTR_DECIMAL_PLACES: // manager/session attribute
case Doctrine::ATTR_LOAD_REFERENCES: case Doctrine::ATTR_LOAD_REFERENCES: // class attribute
case Doctrine::ATTR_RECORD_LISTENER: case Doctrine::ATTR_RECORD_LISTENER: // not an attribute
case Doctrine::ATTR_THROW_EXCEPTIONS: case Doctrine::ATTR_THROW_EXCEPTIONS: // manager/session attribute
case Doctrine::ATTR_DEFAULT_PARAM_NAMESPACE: case Doctrine::ATTR_DEFAULT_PARAM_NAMESPACE:
case Doctrine::ATTR_MODEL_LOADING: case Doctrine::ATTR_MODEL_LOADING: // manager/session attribute
break; break;
case Doctrine::ATTR_SEQCOL_NAME: case Doctrine::ATTR_SEQCOL_NAME: // class attribute
if ( ! is_string($value)) { if ( ! is_string($value)) {
throw new Doctrine_Exception('Sequence column name attribute only accepts string values'); throw new Doctrine_Exception('Sequence column name attribute only accepts string values');
} }
break; break;
case Doctrine::ATTR_FIELD_CASE: case Doctrine::ATTR_FIELD_CASE: // manager/session attribute
if ($value != 0 && $value != CASE_LOWER && $value != CASE_UPPER) if ($value != 0 && $value != CASE_LOWER && $value != CASE_UPPER)
throw new Doctrine_Exception('Field case attribute should be either 0, CASE_LOWER or CASE_UPPER constant.'); throw new Doctrine_Exception('Field case attribute should be either 0, CASE_LOWER or CASE_UPPER constant.');
break; break;
case Doctrine::ATTR_SEQNAME_FORMAT: case Doctrine::ATTR_SEQNAME_FORMAT: // manager/session attribute
case Doctrine::ATTR_IDXNAME_FORMAT: case Doctrine::ATTR_IDXNAME_FORMAT: // manager/session attribute
case Doctrine::ATTR_TBLNAME_FORMAT: case Doctrine::ATTR_TBLNAME_FORMAT: // manager/session attribute
if ($this instanceof Doctrine_Table) { if ($this instanceof Doctrine_ClassMetadata) {
throw new Doctrine_Exception('Sequence / index name format attributes cannot be set' throw new Doctrine_Exception('Sequence / index name format attributes cannot be set'
. 'at table level (only at connection or global level).'); . ' at class level (only at connection or global level).');
} }
break; break;
default: default:
throw new Doctrine_Exception("Unknown attribute."); throw new Doctrine_Exception("Unknown attribute.");
} }
$this->attributes[$attribute] = $value; $this->_attributes[$attribute] = $value;
} }
public function getParams($namespace = null) /*public function getParams($namespace = null)
{ {
if ($namespace == null) { if ($namespace == null) {
$namespace = $this->getAttribute(Doctrine::ATTR_DEFAULT_PARAM_NAMESPACE); $namespace = $this->getAttribute(Doctrine::ATTR_DEFAULT_PARAM_NAMESPACE);
...@@ -180,14 +178,14 @@ abstract class Doctrine_Configurable extends Doctrine_Locator_Injectable ...@@ -180,14 +178,14 @@ abstract class Doctrine_Configurable extends Doctrine_Locator_Injectable
} }
return $this->_params[$namespace]; return $this->_params[$namespace];
} }*/
public function getParamNamespaces() /*public function getParamNamespaces()
{ {
return array_keys($this->_params); return array_keys($this->_params);
} }*/
public function setParam($name, $value, $namespace = null) /*public function setParam($name, $value, $namespace = null)
{ {
if ($namespace == null) { if ($namespace == null) {
$namespace = $this->getAttribute(Doctrine::ATTR_DEFAULT_PARAM_NAMESPACE); $namespace = $this->getAttribute(Doctrine::ATTR_DEFAULT_PARAM_NAMESPACE);
...@@ -196,9 +194,9 @@ abstract class Doctrine_Configurable extends Doctrine_Locator_Injectable ...@@ -196,9 +194,9 @@ abstract class Doctrine_Configurable extends Doctrine_Locator_Injectable
$this->_params[$namespace][$name] = $value; $this->_params[$namespace][$name] = $value;
return $this; return $this;
} }*/
public function getParam($name, $value, $namespace) /*public function getParam($name, $value, $namespace)
{ {
if ($namespace == null) { if ($namespace == null) {
$namespace = $this->getAttribute(Doctrine::ATTR_DEFAULT_PARAM_NAMESPACE); $namespace = $this->getAttribute(Doctrine::ATTR_DEFAULT_PARAM_NAMESPACE);
...@@ -211,7 +209,7 @@ abstract class Doctrine_Configurable extends Doctrine_Locator_Injectable ...@@ -211,7 +209,7 @@ abstract class Doctrine_Configurable extends Doctrine_Locator_Injectable
return null; return null;
} }
return $this->_params[$name]; return $this->_params[$name];
} }*/
/** /**
* setImpl * setImpl
...@@ -223,12 +221,12 @@ abstract class Doctrine_Configurable extends Doctrine_Locator_Injectable ...@@ -223,12 +221,12 @@ abstract class Doctrine_Configurable extends Doctrine_Locator_Injectable
* @param string $class name of the class to be bound * @param string $class name of the class to be bound
* @return Doctrine_Configurable this object * @return Doctrine_Configurable this object
*/ */
public function setImpl($template, $class) /*public function setImpl($template, $class)
{ {
$this->_impl[$template] = $class; $this->_impl[$template] = $class;
return $this; return $this;
} }*/
/** /**
* getImpl * getImpl
...@@ -236,7 +234,7 @@ abstract class Doctrine_Configurable extends Doctrine_Locator_Injectable ...@@ -236,7 +234,7 @@ abstract class Doctrine_Configurable extends Doctrine_Locator_Injectable
* *
* @return string name of the concrete implementation * @return string name of the concrete implementation
*/ */
public function getImpl($template) /*public function getImpl($template)
{ {
if ( ! isset($this->_impl[$template])) { if ( ! isset($this->_impl[$template])) {
if (isset($this->parent)) { if (isset($this->parent)) {
...@@ -245,10 +243,10 @@ abstract class Doctrine_Configurable extends Doctrine_Locator_Injectable ...@@ -245,10 +243,10 @@ abstract class Doctrine_Configurable extends Doctrine_Locator_Injectable
return null; return null;
} }
return $this->_impl[$template]; return $this->_impl[$template];
} }*/
public function hasImpl($template) /*public function hasImpl($template)
{ {
if ( ! isset($this->_impl[$template])) { if ( ! isset($this->_impl[$template])) {
if (isset($this->parent)) { if (isset($this->parent)) {
...@@ -257,7 +255,7 @@ abstract class Doctrine_Configurable extends Doctrine_Locator_Injectable ...@@ -257,7 +255,7 @@ abstract class Doctrine_Configurable extends Doctrine_Locator_Injectable
return false; return false;
} }
return true; return true;
} }*/
/** /**
* @param Doctrine_EventListener $listener * @param Doctrine_EventListener $listener
...@@ -276,12 +274,12 @@ abstract class Doctrine_Configurable extends Doctrine_Locator_Injectable ...@@ -276,12 +274,12 @@ abstract class Doctrine_Configurable extends Doctrine_Locator_Injectable
*/ */
public function addRecordListener($listener, $name = null) public function addRecordListener($listener, $name = null)
{ {
if ( ! isset($this->attributes[Doctrine::ATTR_RECORD_LISTENER]) || if ( ! isset($this->_attributes[Doctrine::ATTR_RECORD_LISTENER]) ||
! ($this->attributes[Doctrine::ATTR_RECORD_LISTENER] instanceof Doctrine_Record_Listener_Chain)) { ! ($this->_attributes[Doctrine::ATTR_RECORD_LISTENER] instanceof Doctrine_Record_Listener_Chain)) {
$this->attributes[Doctrine::ATTR_RECORD_LISTENER] = new Doctrine_Record_Listener_Chain(); $this->_attributes[Doctrine::ATTR_RECORD_LISTENER] = new Doctrine_Record_Listener_Chain();
} }
$this->attributes[Doctrine::ATTR_RECORD_LISTENER]->add($listener, $name); $this->_attributes[Doctrine::ATTR_RECORD_LISTENER]->add($listener, $name);
return $this; return $this;
} }
...@@ -293,13 +291,13 @@ abstract class Doctrine_Configurable extends Doctrine_Locator_Injectable ...@@ -293,13 +291,13 @@ abstract class Doctrine_Configurable extends Doctrine_Locator_Injectable
*/ */
public function getRecordListener() public function getRecordListener()
{ {
if ( ! isset($this->attributes[Doctrine::ATTR_RECORD_LISTENER])) { if ( ! isset($this->_attributes[Doctrine::ATTR_RECORD_LISTENER])) {
if (isset($this->parent)) { if (isset($this->parent)) {
return $this->parent->getRecordListener(); return $this->parent->getRecordListener();
} }
$this->attributes[Doctrine::ATTR_RECORD_LISTENER] = new Doctrine_Record_Listener(); $this->_attributes[Doctrine::ATTR_RECORD_LISTENER] = new Doctrine_Record_Listener();
} }
return $this->attributes[Doctrine::ATTR_RECORD_LISTENER]; return $this->_attributes[Doctrine::ATTR_RECORD_LISTENER];
} }
/** /**
...@@ -315,15 +313,15 @@ abstract class Doctrine_Configurable extends Doctrine_Locator_Injectable ...@@ -315,15 +313,15 @@ abstract class Doctrine_Configurable extends Doctrine_Locator_Injectable
) { ) {
throw new Doctrine_Exception("Couldn't set eventlistener. Record listeners should implement either Doctrine_Record_Listener_Interface or Doctrine_Overloadable"); throw new Doctrine_Exception("Couldn't set eventlistener. Record listeners should implement either Doctrine_Record_Listener_Interface or Doctrine_Overloadable");
} }
$this->attributes[Doctrine::ATTR_RECORD_LISTENER] = $listener; $this->_attributes[Doctrine::ATTR_RECORD_LISTENER] = $listener;
return $this; return $this;
} }
/*
public function removeRecordListeners() public function removeRecordListeners()
{ {
$this->attributes[Doctrine::ATTR_RECORD_LISTENER] = $this->_attributes[Doctrine::ATTR_RECORD_LISTENER] = null;
}*/ }
/** /**
* addListener * addListener
...@@ -333,12 +331,12 @@ abstract class Doctrine_Configurable extends Doctrine_Locator_Injectable ...@@ -333,12 +331,12 @@ abstract class Doctrine_Configurable extends Doctrine_Locator_Injectable
*/ */
public function addListener($listener, $name = null) public function addListener($listener, $name = null)
{ {
if ( ! isset($this->attributes[Doctrine::ATTR_LISTENER]) || if ( ! isset($this->_attributes[Doctrine::ATTR_LISTENER]) ||
! ($this->attributes[Doctrine::ATTR_LISTENER] instanceof Doctrine_EventListener_Chain)) { ! ($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);
return $this; return $this;
} }
...@@ -350,13 +348,13 @@ abstract class Doctrine_Configurable extends Doctrine_Locator_Injectable ...@@ -350,13 +348,13 @@ abstract class Doctrine_Configurable extends Doctrine_Locator_Injectable
*/ */
public function getListener() public function getListener()
{ {
if ( ! isset($this->attributes[Doctrine::ATTR_LISTENER])) { if ( ! isset($this->_attributes[Doctrine::ATTR_LISTENER])) {
if (isset($this->parent)) { if (isset($this->parent)) {
return $this->parent->getListener(); return $this->parent->getListener();
} }
return null; return null;
} }
return $this->attributes[Doctrine::ATTR_LISTENER]; return $this->_attributes[Doctrine::ATTR_LISTENER];
} }
/** /**
...@@ -371,7 +369,7 @@ abstract class Doctrine_Configurable extends Doctrine_Locator_Injectable ...@@ -371,7 +369,7 @@ abstract class Doctrine_Configurable extends Doctrine_Locator_Injectable
&& ! ($listener instanceof Doctrine_Overloadable)) { && ! ($listener instanceof Doctrine_Overloadable)) {
throw new Doctrine_EventListener_Exception("Couldn't set eventlistener. EventListeners should implement either Doctrine_EventListener_Interface or Doctrine_Overloadable"); throw new Doctrine_EventListener_Exception("Couldn't set eventlistener. EventListeners should implement either Doctrine_EventListener_Interface or Doctrine_Overloadable");
} }
$this->attributes[Doctrine::ATTR_LISTENER] = $listener; $this->_attributes[Doctrine::ATTR_LISTENER] = $listener;
return $this; return $this;
} }
...@@ -391,7 +389,6 @@ abstract class Doctrine_Configurable extends Doctrine_Locator_Injectable ...@@ -391,7 +389,6 @@ abstract class Doctrine_Configurable extends Doctrine_Locator_Injectable
if (defined($const)) { if (defined($const)) {
$attribute = constant($const); $attribute = constant($const);
$this->_state = $attribute;
} else { } else {
throw new Doctrine_Exception('Unknown attribute: "' . $attribute . '"'); throw new Doctrine_Exception('Unknown attribute: "' . $attribute . '"');
} }
...@@ -403,8 +400,8 @@ abstract class Doctrine_Configurable extends Doctrine_Locator_Injectable ...@@ -403,8 +400,8 @@ abstract class Doctrine_Configurable extends Doctrine_Locator_Injectable
throw new Doctrine_Exception('Unknown attribute.'); throw new Doctrine_Exception('Unknown attribute.');
} }
if (isset($this->attributes[$attribute])) { if (isset($this->_attributes[$attribute])) {
return $this->attributes[$attribute]; return $this->_attributes[$attribute];
} }
if (isset($this->parent)) { if (isset($this->parent)) {
...@@ -421,7 +418,7 @@ abstract class Doctrine_Configurable extends Doctrine_Locator_Injectable ...@@ -421,7 +418,7 @@ abstract class Doctrine_Configurable extends Doctrine_Locator_Injectable
*/ */
public function getAttributes() public function getAttributes()
{ {
return $this->attributes; return $this->_attributes;
} }
/** /**
...@@ -431,7 +428,7 @@ abstract class Doctrine_Configurable extends Doctrine_Locator_Injectable ...@@ -431,7 +428,7 @@ abstract class Doctrine_Configurable extends Doctrine_Locator_Injectable
* @param Doctrine_Configurable $component * @param Doctrine_Configurable $component
* @return void * @return void
*/ */
public function setParent(Doctrine_Configurable $component) public function setConfigurableParent(Doctrine_Configurable $component)
{ {
$this->parent = $component; $this->parent = $component;
} }
......
lib/Doctrine/Connection.php
View file @ 71ed9242
...@@ -53,6 +53,9 @@ Doctrine::autoload('Doctrine_Configurable'); ...@@ -53,6 +53,9 @@ Doctrine::autoload('Doctrine_Configurable');
* @author Konsta Vesterinen <kvesteri@cc.hut.fi> * @author Konsta Vesterinen <kvesteri@cc.hut.fi>
* @author Lukas Smith <smith@pooteeweet.org> (MDB2 library) * @author Lukas Smith <smith@pooteeweet.org> (MDB2 library)
* @author Roman Borschel <roman@code-factory.org> * @author Roman Borschel <roman@code-factory.org>
* @todo Split up into Doctrine::DBAL::Connection & Doctrine::ORM::EntityManager.
* Doctrine::DBAL::Connection must have no dependencies on ORM components since
* it sits one layer below.
*/ */
abstract class Doctrine_Connection extends Doctrine_Configurable implements Countable, IteratorAggregate abstract class Doctrine_Connection extends Doctrine_Configurable implements Countable, IteratorAggregate
{ {
...@@ -229,7 +232,7 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun ...@@ -229,7 +232,7 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun
} }
$this->setParent($manager); $this->setConfigurableParent($manager);
$this->setAttribute(Doctrine::ATTR_CASE, Doctrine::CASE_NATURAL); $this->setAttribute(Doctrine::ATTR_CASE, Doctrine::CASE_NATURAL);
$this->setAttribute(Doctrine::ATTR_ERRMODE, Doctrine::ERRMODE_EXCEPTION); $this->setAttribute(Doctrine::ATTR_ERRMODE, Doctrine::ERRMODE_EXCEPTION);
...@@ -275,10 +278,10 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun ...@@ -275,10 +278,10 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun
public function getAttribute($attribute) public function getAttribute($attribute)
{ {
if ($attribute >= 100) { if ($attribute >= 100) {
if ( ! isset($this->attributes[$attribute])) { if ( ! isset($this->_attributes[$attribute])) {
return parent::getAttribute($attribute); return parent::getAttribute($attribute);
} }
return $this->attributes[$attribute]; return $this->_attributes[$attribute];
} }
if ($this->isConnected) { if ($this->isConnected) {
...@@ -1563,4 +1566,48 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun ...@@ -1563,4 +1566,48 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun
{ {
return Doctrine_Lib::getConnectionAsString($this); return Doctrine_Lib::getConnectionAsString($this);
} }
public function hasAttribute($key)
{
switch ($key) {
case Doctrine::ATTR_COLL_KEY:
case Doctrine::ATTR_LISTENER:
case Doctrine::ATTR_RECORD_LISTENER:
case Doctrine::ATTR_QUOTE_IDENTIFIER:
case Doctrine::ATTR_SEQCOL_NAME:
case Doctrine::ATTR_FIELD_CASE:
case Doctrine::ATTR_IDXNAME_FORMAT:
case Doctrine::ATTR_SEQNAME_FORMAT:
case Doctrine::ATTR_DBNAME_FORMAT:
case Doctrine::ATTR_TBLCLASS_FORMAT:
case Doctrine::ATTR_TBLNAME_FORMAT:
case Doctrine::ATTR_EXPORT:
case Doctrine::ATTR_DECIMAL_PLACES:
case Doctrine::ATTR_PORTABILITY:
case Doctrine::ATTR_VALIDATE:
case Doctrine::ATTR_QUERY_LIMIT:
case Doctrine::ATTR_DEFAULT_TABLE_TYPE:
case Doctrine::ATTR_DEF_TEXT_LENGTH:
case Doctrine::ATTR_DEF_VARCHAR_LENGTH:
case Doctrine::ATTR_DEF_TABLESPACE:
case Doctrine::ATTR_EMULATE_DATABASE:
case Doctrine::ATTR_USE_NATIVE_ENUM:
case Doctrine::ATTR_CREATE_TABLES:
case Doctrine::ATTR_COLL_LIMIT:
case Doctrine::ATTR_CACHE: // deprecated
case Doctrine::ATTR_RESULT_CACHE:
case Doctrine::ATTR_CACHE_LIFESPAN: // deprecated
case Doctrine::ATTR_RESULT_CACHE_LIFESPAN:
case Doctrine::ATTR_LOAD_REFERENCES:
case Doctrine::ATTR_THROW_EXCEPTIONS:
case Doctrine::ATTR_QUERY_CACHE:
case Doctrine::ATTR_QUERY_CACHE_LIFESPAN:
case Doctrine::ATTR_MODEL_LOADING:
case Doctrine::ATTR_METADATA_CACHE:
case Doctrine::ATTR_METADATA_CACHE_LIFESPAN:
return true;
default:
return false;
}
}
} }
lib/Doctrine/Connection/Common.php
View file @ 71ed9242
...@@ -38,8 +38,9 @@ class Doctrine_Connection_Common extends Doctrine_Connection ...@@ -38,8 +38,9 @@ class Doctrine_Connection_Common extends Doctrine_Connection
* @param string $query * @param string $query
* @param mixed $limit * @param mixed $limit
* @param mixed $offset * @param mixed $offset
* @todo 4th parameter not used? Remove?
*/ */
public function modifyLimitQuery($query, $limit = false,$offset = false,$isManip=false) public function modifyLimitQuery($query, $limit = false, $offset = false, $isManip = false)
{ {
$limit = (int) $limit; $limit = (int) $limit;
$offset = (int) $offset; $offset = (int) $offset;
......
lib/Doctrine/Hydrator.php
View file @ 71ed9242
...@@ -106,9 +106,9 @@ class Doctrine_Hydrator extends Doctrine_Hydrator_Abstract ...@@ -106,9 +106,9 @@ class Doctrine_Hydrator extends Doctrine_Hydrator_Abstract
// Initialize // Initialize
foreach ($this->_queryComponents as $dqlAlias => $component) { foreach ($this->_queryComponents as $dqlAlias => $component) {
// disable lazy-loading of related elements during hydration // disable lazy-loading of related elements during hydration
$component['mapper']->setAttribute(Doctrine::ATTR_LOAD_REFERENCES, false); $component['table']->setAttribute(Doctrine::ATTR_LOAD_REFERENCES, false);
$componentName = $component['mapper']->getComponentName(); $componentName = $component['mapper']->getComponentName();
$listeners[$componentName] = $component['mapper']->getRecordListener(); $listeners[$componentName] = $component['table']->getRecordListener();
$identifierMap[$dqlAlias] = array(); $identifierMap[$dqlAlias] = array();
$prev[$dqlAlias] = array(); $prev[$dqlAlias] = array();
$id[$dqlAlias] = ''; $id[$dqlAlias] = '';
...@@ -121,7 +121,7 @@ class Doctrine_Hydrator extends Doctrine_Hydrator_Abstract ...@@ -121,7 +121,7 @@ class Doctrine_Hydrator extends Doctrine_Hydrator_Abstract
$rowData = $this->_gatherRowData($data, $cache, $id, $nonemptyComponents); $rowData = $this->_gatherRowData($data, $cache, $id, $nonemptyComponents);
// //
// hydrate the data of the root component from the current row // hydrate the data of the root entity from the current row
// //
$table = $this->_queryComponents[$rootAlias]['table']; $table = $this->_queryComponents[$rootAlias]['table'];
$mapper = $this->_queryComponents[$rootAlias]['mapper']; $mapper = $this->_queryComponents[$rootAlias]['mapper'];
...@@ -162,9 +162,10 @@ class Doctrine_Hydrator extends Doctrine_Hydrator_Abstract ...@@ -162,9 +162,10 @@ class Doctrine_Hydrator extends Doctrine_Hydrator_Abstract
// $prev[$rootAlias] now points to the last element in $result. // $prev[$rootAlias] now points to the last element in $result.
// now hydrate the rest of the data found in the current row, that belongs to other // now hydrate the rest of the data found in the current row, that belongs to other
// (related) components. // (related) components.
$oneToOne = false;
foreach ($rowData as $dqlAlias => $data) { foreach ($rowData as $dqlAlias => $data) {
$index = false; $index = false;
$oneToOne = false;
$map = $this->_queryComponents[$dqlAlias]; $map = $this->_queryComponents[$dqlAlias];
$table = $map['table']; $table = $map['table'];
$mapper = $map['mapper']; $mapper = $map['mapper'];
...@@ -181,7 +182,7 @@ class Doctrine_Hydrator extends Doctrine_Hydrator_Abstract ...@@ -181,7 +182,7 @@ class Doctrine_Hydrator extends Doctrine_Hydrator_Abstract
$path = $parent . '.' . $dqlAlias; $path = $parent . '.' . $dqlAlias;
if ( ! isset($prev[$parent])) { if ( ! isset($prev[$parent])) {
break; continue;
} }
// check the type of the relation // check the type of the relation
...@@ -232,7 +233,7 @@ class Doctrine_Hydrator extends Doctrine_Hydrator_Abstract ...@@ -232,7 +233,7 @@ class Doctrine_Hydrator extends Doctrine_Hydrator_Abstract
// re-enable lazy loading // re-enable lazy loading
foreach ($this->_queryComponents as $dqlAlias => $data) { foreach ($this->_queryComponents as $dqlAlias => $data) {
$data['mapper']->setAttribute(Doctrine::ATTR_LOAD_REFERENCES, true); $data['table']->setAttribute(Doctrine::ATTR_LOAD_REFERENCES, true);
} }
//$e = microtime(true); //$e = microtime(true);
......
lib/Doctrine/Manager.php
View file @ 71ed9242
...@@ -123,10 +123,56 @@ class Doctrine_Manager extends Doctrine_Configurable implements Countable, Itera ...@@ -123,10 +123,56 @@ class Doctrine_Manager extends Doctrine_Configurable implements Countable, Itera
return false; return false;
} }
public function hasAttribute($key)
{
switch ($key) {
case Doctrine::ATTR_DEFAULT_PARAM_NAMESPACE:
case Doctrine::ATTR_COLL_KEY:
case Doctrine::ATTR_SEQCOL_NAME:
case Doctrine::ATTR_LISTENER:
case Doctrine::ATTR_RECORD_LISTENER:
case Doctrine::ATTR_QUOTE_IDENTIFIER:
case Doctrine::ATTR_FIELD_CASE:
case Doctrine::ATTR_IDXNAME_FORMAT:
case Doctrine::ATTR_SEQNAME_FORMAT:
case Doctrine::ATTR_DBNAME_FORMAT:
case Doctrine::ATTR_TBLCLASS_FORMAT:
case Doctrine::ATTR_TBLNAME_FORMAT:
case Doctrine::ATTR_EXPORT:
case Doctrine::ATTR_DECIMAL_PLACES:
case Doctrine::ATTR_PORTABILITY:
case Doctrine::ATTR_VALIDATE:
case Doctrine::ATTR_QUERY_LIMIT:
case Doctrine::ATTR_DEFAULT_TABLE_TYPE:
case Doctrine::ATTR_DEF_TEXT_LENGTH:
case Doctrine::ATTR_DEF_VARCHAR_LENGTH:
case Doctrine::ATTR_DEF_TABLESPACE:
case Doctrine::ATTR_EMULATE_DATABASE:
case Doctrine::ATTR_USE_NATIVE_ENUM:
case Doctrine::ATTR_CREATE_TABLES:
case Doctrine::ATTR_COLL_LIMIT:
case Doctrine::ATTR_CACHE: // deprecated
case Doctrine::ATTR_RESULT_CACHE:
case Doctrine::ATTR_CACHE_LIFESPAN: // deprecated
case Doctrine::ATTR_RESULT_CACHE_LIFESPAN:
case Doctrine::ATTR_LOAD_REFERENCES:
case Doctrine::ATTR_THROW_EXCEPTIONS:
case Doctrine::ATTR_QUERY_CACHE:
case Doctrine::ATTR_QUERY_CACHE_LIFESPAN:
case Doctrine::ATTR_MODEL_LOADING:
case Doctrine::ATTR_METADATA_CACHE:
case Doctrine::ATTR_METADATA_CACHE_LIFESPAN:
return true;
default:
return false;
}
}
/** /**
* returns the root directory of Doctrine * returns the root directory of Doctrine
* *
* @return string * @return string
* @todo Better name.
*/ */
final public function getRoot() final public function getRoot()
{ {
......
lib/Doctrine/Mapper.php
View file @ 71ed9242
...@@ -31,11 +31,12 @@ ...@@ -31,11 +31,12 @@
* @link www.phpdoctrine.org * @link www.phpdoctrine.org
* @since 1.0 * @since 1.0
*/ */
class Doctrine_Mapper extends Doctrine_Configurable implements Countable class Doctrine_Mapper
{ {
/** /**
* @var Doctrine_Table Metadata container that represents the database table this * Metadata object that descibes the mapping of the mapped entity class.
* mapper is mapping objects to. *
* @var Doctrine_ClassMetadata
*/ */
protected $_classMetadata; protected $_classMetadata;
...@@ -62,6 +63,16 @@ class Doctrine_Mapper extends Doctrine_Configurable implements Countable ...@@ -62,6 +63,16 @@ class Doctrine_Mapper extends Doctrine_Configurable implements Countable
*/ */
protected $_identityMap = array(); protected $_identityMap = array();
/**
* Null object.
*/
private $_nullObject;
/**
* A list of registered entity listeners.
*/
private $_entityListeners = array();
/** /**
* Constructs a new mapper. * Constructs a new mapper.
...@@ -72,18 +83,10 @@ class Doctrine_Mapper extends Doctrine_Configurable implements Countable ...@@ -72,18 +83,10 @@ class Doctrine_Mapper extends Doctrine_Configurable implements Countable
*/ */
public function __construct($name, Doctrine_ClassMetadata $classMetadata) public function __construct($name, Doctrine_ClassMetadata $classMetadata)
{ {
if ($name != $classMetadata->getClassName()) {
try {
throw new Exception();
} catch (Exception $e) {
echo $e->getTraceAsString() . "<br/><br/>";
}
}
$this->_domainClassName = $name; $this->_domainClassName = $name;
$this->_conn = $classMetadata->getConnection(); $this->_conn = $classMetadata->getConnection();
$this->_classMetadata = $classMetadata; $this->_classMetadata = $classMetadata;
$this->setParent($this->_conn); $this->_nullObject = Doctrine_Null::getInstance();
if ($classMetadata->getInheritanceType() == Doctrine::INHERITANCETYPE_JOINED) { if ($classMetadata->getInheritanceType() == Doctrine::INHERITANCETYPE_JOINED) {
$this->_mappingStrategy = new Doctrine_Mapper_JoinedStrategy($this); $this->_mappingStrategy = new Doctrine_Mapper_JoinedStrategy($this);
} else { } else {
...@@ -91,34 +94,6 @@ class Doctrine_Mapper extends Doctrine_Configurable implements Countable ...@@ -91,34 +94,6 @@ class Doctrine_Mapper extends Doctrine_Configurable implements Countable
} }
} }
/**
* export
* exports this table to database based on column and option definitions
*
* @throws Doctrine_Connection_Exception if some error other than Doctrine::ERR_ALREADY_EXISTS
* occurred during the create table operation
* @return boolean whether or not the export operation was successful
* false if table already existed in the database
* @deprecated
* @todo Remove
*/
/*public function export()
{
$this->_conn->export->exportTable($this->_table);
}*/
/**
* getExportableFormat
* returns exportable presentation of this object
*
* @return array
* @todo move to Table
*/
/*public function getExportableFormat($parseForeignKeys = true)
{
return $this->_table->getExportableFormat($parseForeignKeys);
}*/
/** /**
* createQuery * createQuery
* creates a new Doctrine_Query object and adds the component name * creates a new Doctrine_Query object and adds the component name
...@@ -146,7 +121,6 @@ class Doctrine_Mapper extends Doctrine_Configurable implements Countable ...@@ -146,7 +121,6 @@ class Doctrine_Mapper extends Doctrine_Configurable implements Countable
public function setConnection(Doctrine_Connection $conn) public function setConnection(Doctrine_Connection $conn)
{ {
$this->_conn = $conn; $this->_conn = $conn;
$this->setParent($this->_conn);
return $this; return $this;
} }
...@@ -175,6 +149,34 @@ class Doctrine_Mapper extends Doctrine_Configurable implements Countable ...@@ -175,6 +149,34 @@ class Doctrine_Mapper extends Doctrine_Configurable implements Countable
return $record; return $record;
} }
public function addEntityListener(Doctrine_Record_Listener $listener)
{
if ( ! in_array($listener, $this->_entityListeners)) {
$this->_entityListeners[] = $listener;
return true;
}
return false;
}
public function removeEntityListener(Doctrine_Record_Listener $listener)
{
if ($key = array_search($listener, $this->_entityListeners, true)) {
unset($this->_entityListeners[$key]);
return true;
}
return false;
}
public function notifyEntityListeners(Doctrine_Record $entity, $callback, $eventType)
{
if ($this->_entityListeners) {
$event = new Doctrine_Event($entity, $eventType);
foreach ($this->_entityListeners as $listener) {
$listener->$callback($event);
}
}
}
public function detach(Doctrine_Record $entity) public function detach(Doctrine_Record $entity)
{ {
return $this->_conn->unitOfWork->detach($entity); return $this->_conn->unitOfWork->detach($entity);
...@@ -425,18 +427,6 @@ class Doctrine_Mapper extends Doctrine_Configurable implements Countable ...@@ -425,18 +427,6 @@ class Doctrine_Mapper extends Doctrine_Configurable implements Countable
return $where; return $where;
} }
/**
* count
*
* @return integer
*/
public function count()
{
$a = $this->_conn->execute('SELECT COUNT(1) FROM ' . $this->_classMetadata->getTableName())
->fetch(Doctrine::FETCH_NUM);
return current($a);
}
/** /**
* prepareValue * prepareValue
* this method performs special data preparation depending on * this method performs special data preparation depending on
...@@ -465,8 +455,8 @@ class Doctrine_Mapper extends Doctrine_Configurable implements Countable ...@@ -465,8 +455,8 @@ class Doctrine_Mapper extends Doctrine_Configurable implements Countable
*/ */
public function prepareValue($fieldName, $value, $typeHint = null) public function prepareValue($fieldName, $value, $typeHint = null)
{ {
if ($value === self::$_null) { if ($value === $this->_nullObject) {
return self::$_null; return $this->_nullObject;
} else if ($value === null) { } else if ($value === null) {
return null; return null;
} else { } else {
...@@ -619,6 +609,11 @@ class Doctrine_Mapper extends Doctrine_Configurable implements Countable ...@@ -619,6 +609,11 @@ class Doctrine_Mapper extends Doctrine_Configurable implements Countable
$by = substr($method, 9, strlen($method)); $by = substr($method, 9, strlen($method));
$method = 'findOneBy'; $method = 'findOneBy';
} else { } else {
try {
throw new Exception();
} catch (Exception $e) {
echo $e->getTraceAsString() . "<br/><br/>";
}
throw new Doctrine_Mapper_Exception("Undefined method '$method'."); throw new Doctrine_Mapper_Exception("Undefined method '$method'.");
} }
...@@ -716,11 +711,9 @@ class Doctrine_Mapper extends Doctrine_Configurable implements Countable ...@@ -716,11 +711,9 @@ class Doctrine_Mapper extends Doctrine_Configurable implements Countable
*/ */
protected function _insertOrUpdate(Doctrine_Record $record) protected function _insertOrUpdate(Doctrine_Record $record)
{ {
$event = new Doctrine_Event($record, Doctrine_Event::RECORD_SAVE); $record->preSave();
$record->preSave($event); $this->notifyEntityListeners($record, 'preSave', Doctrine_Event::RECORD_SAVE);
$this->getRecordListener()->preSave($event);
if ( ! $event->skipOperation) {
switch ($record->state()) { switch ($record->state()) {
case Doctrine_Record::STATE_TDIRTY: case Doctrine_Record::STATE_TDIRTY:
$this->_insert($record); $this->_insert($record);
...@@ -734,10 +727,9 @@ class Doctrine_Mapper extends Doctrine_Configurable implements Countable ...@@ -734,10 +727,9 @@ class Doctrine_Mapper extends Doctrine_Configurable implements Countable
// do nothing // do nothing
break; break;
} }
}
$this->getRecordListener()->postSave($event); $record->postSave();
$record->postSave($event); $this->notifyEntityListeners($record, 'postSave', Doctrine_Event::RECORD_SAVE);
} }
/** /**
...@@ -844,17 +836,14 @@ class Doctrine_Mapper extends Doctrine_Configurable implements Countable ...@@ -844,17 +836,14 @@ class Doctrine_Mapper extends Doctrine_Configurable implements Countable
*/ */
protected function _update(Doctrine_Record $record) protected function _update(Doctrine_Record $record)
{ {
$event = new Doctrine_Event($record, Doctrine_Event::RECORD_UPDATE); $record->preUpdate();
$record->preUpdate($event); $this->notifyEntityListeners($record, 'preUpdate', Doctrine_Event::RECORD_UPDATE);
$table = $this->_classMetadata;
$this->getRecordListener()->preUpdate($event);
if ( ! $event->skipOperation) { $table = $this->_classMetadata;
$this->_mappingStrategy->doUpdate($record); $this->_mappingStrategy->doUpdate($record);
}
$this->getRecordListener()->postUpdate($event); $record->postUpdate();
$record->postUpdate($event); $this->notifyEntityListeners($record, 'postUpdate', Doctrine_Event::RECORD_UPDATE);
return true; return true;
} }
...@@ -867,19 +856,14 @@ class Doctrine_Mapper extends Doctrine_Configurable implements Countable ...@@ -867,19 +856,14 @@ class Doctrine_Mapper extends Doctrine_Configurable implements Countable
*/ */
protected function _insert(Doctrine_Record $record) protected function _insert(Doctrine_Record $record)
{ {
// trigger event $record->preInsert();
$event = new Doctrine_Event($record, Doctrine_Event::RECORD_INSERT); $this->notifyEntityListeners($record, 'preInsert', Doctrine_Event::RECORD_INSERT);
$record->preInsert($event);
$this->getRecordListener()->preInsert($event);
if ( ! $event->skipOperation) {
$this->_mappingStrategy->doInsert($record); $this->_mappingStrategy->doInsert($record);
}
// trigger event
$this->addRecord($record); $this->addRecord($record);
$this->getRecordListener()->postInsert($event);
$record->postInsert($event); $record->postInsert();
$this->notifyEntityListeners($record, 'postInsert', Doctrine_Event::RECORD_INSERT);
return true; return true;
} }
...@@ -907,26 +891,33 @@ class Doctrine_Mapper extends Doctrine_Configurable implements Countable ...@@ -907,26 +891,33 @@ class Doctrine_Mapper extends Doctrine_Configurable implements Countable
$conn = $this->_conn; $conn = $this->_conn;
} }
$event = new Doctrine_Event($record, Doctrine_Event::RECORD_DELETE); $record->preDelete();
$record->preDelete($event); $this->notifyEntityListeners($record, 'preDelete', Doctrine_Event::RECORD_DELETE);
$this->getRecordListener()->preDelete($event);
$table = $this->_classMetadata; $table = $this->_classMetadata;
$state = $record->state(); $state = $record->state();
$record->state(Doctrine_Record::STATE_LOCKED); $record->state(Doctrine_Record::STATE_LOCKED);
if ( ! $event->skipOperation) {
$this->_mappingStrategy->doDelete($record); $this->_mappingStrategy->doDelete($record);
} else {
// return to original state
$record->state($state);
}
$this->getRecordListener()->postDelete($event); $record->postDelete();
$record->postDelete($event); $this->notifyEntityListeners($record, 'postDelete', Doctrine_Event::RECORD_DELETE);
return true;
}
public function hasAttribute($key)
{
switch ($key) {
case Doctrine::ATTR_LOAD_REFERENCES:
case Doctrine::ATTR_QUERY_LIMIT:
case Doctrine::ATTR_COLL_KEY:
case Doctrine::ATTR_VALIDATE:
return true; return true;
default:
return false;
}
} }
public function executeQuery(Doctrine_Query $query) public function executeQuery(Doctrine_Query $query)
...@@ -959,7 +950,7 @@ class Doctrine_Mapper extends Doctrine_Configurable implements Countable ...@@ -959,7 +950,7 @@ class Doctrine_Mapper extends Doctrine_Configurable implements Countable
$this->_mappingStrategy = null; $this->_mappingStrategy = null;
} }
public function getMappingStrategy() public function getMapping()
{ {
return $this->_mappingStrategy; return $this->_mappingStrategy;
} }
...@@ -976,9 +967,9 @@ class Doctrine_Mapper extends Doctrine_Configurable implements Countable ...@@ -976,9 +967,9 @@ class Doctrine_Mapper extends Doctrine_Configurable implements Countable
return $this->_mappingStrategy->getFieldNames(); return $this->_mappingStrategy->getFieldNames();
} }
public function getOwningTable($fieldName) public function getOwningClass($fieldName)
{ {
return $this->_mappingStrategy->getOwningTable($fieldName); return $this->_mappingStrategy->getOwningClass($fieldName);
} }
/* Hooks used during SQL query construction to manipulate the query. */ /* Hooks used during SQL query construction to manipulate the query. */
......
lib/Doctrine/Mapper/JoinedStrategy.php
View file @ 71ed9242
...@@ -238,15 +238,7 @@ class Doctrine_Mapper_JoinedStrategy extends Doctrine_Mapper_Strategy ...@@ -238,15 +238,7 @@ class Doctrine_Mapper_JoinedStrategy extends Doctrine_Mapper_Strategy
return $this->_columnNameFieldNameMap[$columnName]; return $this->_columnNameFieldNameMap[$columnName];
} }
foreach ($classMetadata->getParentClasses() as $parentClass) { foreach ($classMetadata->getSubclasses() as $subClass) {
$parentTable = $conn->getClassMetadata($parentClass);
if ($parentTable->hasColumn($columnName)) {
$this->_columnNameFieldNameMap[$columnName] = $parentTable->getFieldName($columnName);
return $this->_columnNameFieldNameMap[$columnName];
}
}
foreach ((array)$classMetadata->getSubclasses() as $subClass) {
$subTable = $conn->getClassMetadata($subClass); $subTable = $conn->getClassMetadata($subClass);
if ($subTable->hasColumn($columnName)) { if ($subTable->hasColumn($columnName)) {
$this->_columnNameFieldNameMap[$columnName] = $subTable->getFieldName($columnName); $this->_columnNameFieldNameMap[$columnName] = $subTable->getFieldName($columnName);
...@@ -261,7 +253,7 @@ class Doctrine_Mapper_JoinedStrategy extends Doctrine_Mapper_Strategy ...@@ -261,7 +253,7 @@ class Doctrine_Mapper_JoinedStrategy extends Doctrine_Mapper_Strategy
* *
* @todo Looks like this better belongs into the ClassMetadata class. * @todo Looks like this better belongs into the ClassMetadata class.
*/ */
public function getOwningTable($fieldName) public function getOwningClass($fieldName)
{ {
$conn = $this->_mapper->getConnection(); $conn = $this->_mapper->getConnection();
$classMetadata = $this->_mapper->getClassMetadata(); $classMetadata = $this->_mapper->getClassMetadata();
...@@ -283,13 +275,14 @@ class Doctrine_Mapper_JoinedStrategy extends Doctrine_Mapper_Strategy ...@@ -283,13 +275,14 @@ class Doctrine_Mapper_JoinedStrategy extends Doctrine_Mapper_Strategy
} }
} }
throw new Doctrine_Mapper_Exception("Unable to find owner of field '$fieldName'."); throw new Doctrine_Mapper_Exception("Unable to find defining class of field '$fieldName'.");
} }
/** /**
* Analyzes the fields of the entity and creates a map in which the field names * Analyzes the fields of the entity and creates a map in which the field names
* are grouped by the class names they belong to. * are grouped by the class names they belong to.
* *
* @return array
*/ */
protected function _groupFieldsByDefiningClass(Doctrine_Record $record) protected function _groupFieldsByDefiningClass(Doctrine_Record $record)
{ {
......
lib/Doctrine/Mapper/Strategy.php
View file @ 71ed9242
...@@ -90,7 +90,7 @@ abstract class Doctrine_Mapper_Strategy ...@@ -90,7 +90,7 @@ abstract class Doctrine_Mapper_Strategy
return $this->_fieldNames; return $this->_fieldNames;
} }
public function getOwningTable($fieldName) public function getOwningClass($fieldName)
{ {
return $this->_mapper->getClassMetadata(); return $this->_mapper->getClassMetadata();
} }
......
lib/Doctrine/Null.php
View file @ 71ed9242
...@@ -35,6 +35,17 @@ ...@@ -35,6 +35,17 @@
*/ */
final class Doctrine_Null final class Doctrine_Null
{ {
private static $_instance;
public function __construct() {}
public static function getInstance()
{
if (is_null(self::$_instance)) {
self::$_instance = new Doctrine_Null();
}
return self::$_instance;
}
public function exists() public function exists()
{ {
return false; return false;
......
lib/Doctrine/Query.php
View file @ 71ed9242
...@@ -470,7 +470,7 @@ class Doctrine_Query extends Doctrine_Query_Abstract implements Countable, Seria ...@@ -470,7 +470,7 @@ class Doctrine_Query extends Doctrine_Query_Abstract implements Countable, Seria
$sql = array(); $sql = array();
foreach ($fields as $fieldName) { foreach ($fields as $fieldName) {
$table = $mapper->getOwningTable($fieldName); $table = $mapper->getOwningClass($fieldName);
if ($table !== $baseTable) { if ($table !== $baseTable) {
$tableAlias = $this->getSqlTableAlias($componentAlias . '.' . $table->getComponentName()); $tableAlias = $this->getSqlTableAlias($componentAlias . '.' . $table->getComponentName());
} else { } else {
......
lib/Doctrine/Record.php
View file @ 71ed9242
...@@ -31,10 +31,8 @@ Doctrine::autoload('Doctrine_Record_Abstract'); ...@@ -31,10 +31,8 @@ Doctrine::autoload('Doctrine_Record_Abstract');
* @link www.phpdoctrine.org * @link www.phpdoctrine.org
* @since 1.0 * @since 1.0
* @version $Revision$ * @version $Revision$
* @todo Remove the depdency on the ClassMetadata. All operations that involve the metadata
* should be left to the mapper.
*/ */
abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Countable, IteratorAggregate, Serializable abstract class Doctrine_Record extends Doctrine_Access implements Countable, IteratorAggregate, Serializable
{ {
/** /**
* STATE CONSTANTS * STATE CONSTANTS
...@@ -90,23 +88,40 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count ...@@ -90,23 +88,40 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
/** /**
* Boolean flag that indicated whether automatic accessor overriding is enabled. * Boolean flag that indicated whether automatic accessor overriding is enabled.
*
* @var boolean
*/ */
private static $_useAutoAccessorOverride; private static $_useAutoAccessorOverride;
/** /**
* The accessor cache is used as a memory for the existance of custom accessors * The accessor cache is used as a memory for the existance of custom accessors
* for fields. * for fields.
* Only used when ATTR_ACCESSOR_OVERRIDE is set to ACCESSOR_OVERRIDE_AUTO. *
* @var array
*/ */
private static $_accessorCache = array(); private static $_accessorCache = array();
/** /**
* The mutator cache is used as a memory for the existance of custom mutators * The mutator cache is used as a memory for the existance of custom mutators
* for fields. * for fields.
* Only used when ATTR_ACCESSOR_OVERRIDE is set to ACCESSOR_OVERRIDE_MANUAL. *
* @var array
*/ */
private static $_mutatorCache = array(); private static $_mutatorCache = array();
/**
* The metadata container that describes the entity class.
*
* @var Doctrine_ClassMetadata
*/
protected $_class;
/**
*
* @var Doctrine_Mapper
*/
protected $_mapper;
/** /**
* *
*/ */
...@@ -164,16 +179,16 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count ...@@ -164,16 +179,16 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
protected $_errorStack; protected $_errorStack;
/** /**
* The names of all relations. * The references for all associations of the entity to other entities.
* *
* @var array $_references * @var array
*/ */
protected $_references = array(); protected $_references = array();
/** /**
* The object identifier of the object. Each object has a unique identifier during runtime. * The object identifier of the object. Each object has a unique identifier during runtime.
* *
* @var integer $oid * @var integer
*/ */
private $_oid; private $_oid;
...@@ -194,11 +209,11 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count ...@@ -194,11 +209,11 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
if (isset($mapper) && $mapper instanceof Doctrine_Mapper) { if (isset($mapper) && $mapper instanceof Doctrine_Mapper) {
$class = get_class($this); $class = get_class($this);
$this->_mapper = Doctrine_Manager::getInstance()->getMapper($class); $this->_mapper = Doctrine_Manager::getInstance()->getMapper($class);
$this->_table = $this->_mapper->getClassMetadata(); $this->_class = $this->_mapper->getClassMetadata();
$exists = ! $isNewEntry; $exists = ! $isNewEntry;
} else { } else {
$this->_mapper = Doctrine_Manager::getInstance()->getMapper(get_class($this)); $this->_mapper = Doctrine_Manager::getInstance()->getMapper(get_class($this));
$this->_table = $this->_mapper->getClassMetadata(); $this->_class = $this->_mapper->getClassMetadata();
$exists = false; $exists = false;
} }
...@@ -228,7 +243,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count ...@@ -228,7 +243,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
$this->assignDefaultValues(); $this->assignDefaultValues();
} else { } else {
$this->_state = Doctrine_Record::STATE_CLEAN; $this->_state = Doctrine_Record::STATE_CLEAN;
if ($count < $this->_table->getColumnCount()) { if ($count < $this->_class->getColumnCount()) {
$this->_state = Doctrine_Record::STATE_PROXY; $this->_state = Doctrine_Record::STATE_PROXY;
} }
} }
...@@ -286,7 +301,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count ...@@ -286,7 +301,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
*/ */
public function isValid() public function isValid()
{ {
if ( ! $this->_mapper->getAttribute(Doctrine::ATTR_VALIDATE)) { if ( ! $this->_class->getAttribute(Doctrine::ATTR_VALIDATE)) {
return true; return true;
} }
...@@ -334,56 +349,56 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count ...@@ -334,56 +349,56 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
* Empty template method to provide concrete Record classes with the possibility * Empty template method to provide concrete Record classes with the possibility
* to hook into the serializing procedure. * to hook into the serializing procedure.
*/ */
public function preSerialize(Doctrine_Event $event) public function preSerialize()
{ } { }
/** /**
* Empty template method to provide concrete Record classes with the possibility * Empty template method to provide concrete Record classes with the possibility
* to hook into the serializing procedure. * to hook into the serializing procedure.
*/ */
public function postSerialize(Doctrine_Event $event) public function postSerialize()
{ } { }
/** /**
* Empty template method to provide concrete Record classes with the possibility * Empty template method to provide concrete Record classes with the possibility
* to hook into the serializing procedure. * to hook into the serializing procedure.
*/ */
public function preUnserialize(Doctrine_Event $event) public function preUnserialize()
{ } { }
/** /**
* Empty template method to provide concrete Record classes with the possibility * Empty template method to provide concrete Record classes with the possibility
* to hook into the serializing procedure. * to hook into the serializing procedure.
*/ */
public function postUnserialize(Doctrine_Event $event) public function postUnserialize()
{ } { }
/** /**
* Empty template method to provide concrete Record classes with the possibility * Empty template method to provide concrete Record classes with the possibility
* to hook into the saving procedure. * to hook into the saving procedure.
*/ */
public function preSave(Doctrine_Event $event) public function preSave()
{ } { }
/** /**
* Empty template method to provide concrete Record classes with the possibility * Empty template method to provide concrete Record classes with the possibility
* to hook into the saving procedure. * to hook into the saving procedure.
*/ */
public function postSave(Doctrine_Event $event) public function postSave()
{ } { }
/** /**
* Empty template method to provide concrete Record classes with the possibility * Empty template method to provide concrete Record classes with the possibility
* to hook into the deletion procedure. * to hook into the deletion procedure.
*/ */
public function preDelete(Doctrine_Event $event) public function preDelete()
{ } { }
/** /**
* Empty template method to provide concrete Record classes with the possibility * Empty template method to provide concrete Record classes with the possibility
* to hook into the deletion procedure. * to hook into the deletion procedure.
*/ */
public function postDelete(Doctrine_Event $event) public function postDelete()
{ } { }
/** /**
...@@ -391,7 +406,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count ...@@ -391,7 +406,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
* to hook into the saving procedure only when the record is going to be * to hook into the saving procedure only when the record is going to be
* updated. * updated.
*/ */
public function preUpdate(Doctrine_Event $event) public function preUpdate()
{ } { }
/** /**
...@@ -399,7 +414,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count ...@@ -399,7 +414,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
* to hook into the saving procedure only when the record is going to be * to hook into the saving procedure only when the record is going to be
* updated. * updated.
*/ */
public function postUpdate(Doctrine_Event $event) public function postUpdate()
{ } { }
/** /**
...@@ -407,7 +422,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count ...@@ -407,7 +422,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
* to hook into the saving procedure only when the record is going to be * to hook into the saving procedure only when the record is going to be
* inserted into the data store the first time. * inserted into the data store the first time.
*/ */
public function preInsert(Doctrine_Event $event) public function preInsert()
{ } { }
/** /**
...@@ -415,7 +430,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count ...@@ -415,7 +430,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
* to hook into the saving procedure only when the record is going to be * to hook into the saving procedure only when the record is going to be
* inserted into the data store the first time. * inserted into the data store the first time.
*/ */
public function postInsert(Doctrine_Event $event) public function postInsert()
{ } { }
/** /**
...@@ -460,11 +475,11 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count ...@@ -460,11 +475,11 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
*/ */
public function assignDefaultValues($overwrite = false) public function assignDefaultValues($overwrite = false)
{ {
if ( ! $this->_table->hasDefaultValues()) { if ( ! $this->_class->hasDefaultValues()) {
return false; return false;
} }
foreach ($this->_data as $column => $value) { foreach ($this->_data as $column => $value) {
$default = $this->_table->getDefaultValueOf($column); $default = $this->_class->getDefaultValueOf($column);
if ($default === null) { if ($default === null) {
continue; continue;
...@@ -532,11 +547,11 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count ...@@ -532,11 +547,11 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
*/ */
private function _extractIdentifier($exists = true) private function _extractIdentifier($exists = true)
{ {
switch ($this->_table->getIdentifierType()) { switch ($this->_class->getIdentifierType()) {
case Doctrine::IDENTIFIER_AUTOINC: case Doctrine::IDENTIFIER_AUTOINC:
case Doctrine::IDENTIFIER_SEQUENCE: case Doctrine::IDENTIFIER_SEQUENCE:
case Doctrine::IDENTIFIER_NATURAL: case Doctrine::IDENTIFIER_NATURAL:
$name = (array)$this->_table->getIdentifier(); $name = (array)$this->_class->getIdentifier();
$name = $name[0]; $name = $name[0];
if ($exists) { if ($exists) {
if (isset($this->_data[$name]) && $this->_data[$name] !== self::$_null) { if (isset($this->_data[$name]) && $this->_data[$name] !== self::$_null) {
...@@ -545,7 +560,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count ...@@ -545,7 +560,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
} }
break; break;
case Doctrine::IDENTIFIER_COMPOSITE: case Doctrine::IDENTIFIER_COMPOSITE:
$names = (array)$this->_table->getIdentifier(); $names = (array)$this->_class->getIdentifier();
foreach ($names as $name) { foreach ($names as $name) {
if ($this->_data[$name] === self::$_null) { if ($this->_data[$name] === self::$_null) {
...@@ -583,12 +598,12 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count ...@@ -583,12 +598,12 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
$this->_data = array_merge($this->_data, $this->_id); $this->_data = array_merge($this->_data, $this->_id);
foreach ($this->_data as $k => $v) { foreach ($this->_data as $k => $v) {
if ($v instanceof Doctrine_Record && $this->_table->getTypeOf($k) != 'object') { if ($v instanceof Doctrine_Record && $this->_class->getTypeOf($k) != 'object') {
unset($vars['_data'][$k]); unset($vars['_data'][$k]);
} else if ($v === self::$_null) { } else if ($v === self::$_null) {
unset($vars['_data'][$k]); unset($vars['_data'][$k]);
} else { } else {
switch ($this->_table->getTypeOf($k)) { switch ($this->_class->getTypeOf($k)) {
case 'array': case 'array':
case 'object': case 'object':
$vars['_data'][$k] = serialize($vars['_data'][$k]); $vars['_data'][$k] = serialize($vars['_data'][$k]);
...@@ -597,7 +612,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count ...@@ -597,7 +612,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
$vars['_data'][$k] = gzcompress($vars['_data'][$k]); $vars['_data'][$k] = gzcompress($vars['_data'][$k]);
break; break;
case 'enum': case 'enum':
$vars['_data'][$k] = $this->_table->enumIndex($k, $vars['_data'][$k]); $vars['_data'][$k] = $this->_class->enumIndex($k, $vars['_data'][$k]);
break; break;
} }
} }
...@@ -638,10 +653,10 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count ...@@ -638,10 +653,10 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
$this->$k = $v; $this->$k = $v;
} }
$this->_table = $this->_mapper->getTable(); $this->_class = $this->_mapper->getTable();
foreach ($this->_data as $k => $v) { foreach ($this->_data as $k => $v) {
switch ($this->_table->getTypeOf($k)) { switch ($this->_class->getTypeOf($k)) {
case 'array': case 'array':
case 'object': case 'object':
$this->_data[$k] = unserialize($this->_data[$k]); $this->_data[$k] = unserialize($this->_data[$k]);
...@@ -650,7 +665,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count ...@@ -650,7 +665,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
$this->_data[$k] = gzuncompress($this->_data[$k]); $this->_data[$k] = gzuncompress($this->_data[$k]);
break; break;
case 'enum': case 'enum':
$this->_data[$k] = $this->_table->enumValue($k, $this->_data[$k]); $this->_data[$k] = $this->_class->enumValue($k, $this->_data[$k]);
break; break;
} }
...@@ -734,7 +749,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count ...@@ -734,7 +749,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
foreach (array_keys($this->_references) as $name) { foreach (array_keys($this->_references) as $name) {
$query->leftJoin(get_class($this) . '.' . $name); $query->leftJoin(get_class($this) . '.' . $name);
} }
$query->where(implode(' = ? AND ', $this->_table->getIdentifierColumnNames()) . ' = ?'); $query->where(implode(' = ? AND ', $this->_class->getIdentifierColumnNames()) . ' = ?');
$this->clearRelated(); $this->clearRelated();
$record = $query->fetchOne($id); $record = $query->fetchOne($id);
} else { } else {
...@@ -771,11 +786,11 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count ...@@ -771,11 +786,11 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
public function refreshRelated($name = null) public function refreshRelated($name = null)
{ {
if (is_null($name)) { if (is_null($name)) {
foreach ($this->_table->getRelations() as $rel) { foreach ($this->_class->getRelations() as $rel) {
$this->_references[$rel->getAlias()] = $rel->fetchRelatedFor($this); $this->_references[$rel->getAlias()] = $rel->fetchRelatedFor($this);
} }
} else { } else {
$rel = $this->_table->getRelation($name); $rel = $this->_class->getRelation($name);
$this->_references[$name] = $rel->fetchRelatedFor($this); $this->_references[$name] = $rel->fetchRelatedFor($this);
} }
} }
...@@ -868,7 +883,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count ...@@ -868,7 +883,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
self::$_accessorCache[$this->_entityName][$fieldName] = false; self::$_accessorCache[$this->_entityName][$fieldName] = false;
} }
} }
if ($getter = $this->_table->getCustomAccessor($fieldName)) { if ($getter = $this->_class->getCustomAccessor($fieldName)) {
self::$_accessorCache[$this->_entityName][$fieldName] = $getter; self::$_accessorCache[$this->_entityName][$fieldName] = $getter;
} else if ( ! isset(self::$_accessorCache[$this->_entityName][$fieldName])) { } else if ( ! isset(self::$_accessorCache[$this->_entityName][$fieldName])) {
self::$_accessorCache[$this->_entityName][$fieldName] = false; self::$_accessorCache[$this->_entityName][$fieldName] = false;
...@@ -900,12 +915,12 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count ...@@ -900,12 +915,12 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
try { try {
if ( ! isset($this->_references[$fieldName]) && $load) { if ( ! isset($this->_references[$fieldName]) && $load) {
$rel = $this->_table->getRelation($fieldName); $rel = $this->_class->getRelation($fieldName);
$this->_references[$fieldName] = $rel->fetchRelatedFor($this); $this->_references[$fieldName] = $rel->fetchRelatedFor($this);
} }
return $this->_references[$fieldName]; return $this->_references[$fieldName];
} catch (Doctrine_Relation_Exception $e) { } catch (Doctrine_Relation_Exception $e) {
foreach ($this->_table->getFilters() as $filter) { foreach ($this->_class->getFilters() as $filter) {
if (($value = $filter->filterGet($this, $fieldName, $value)) !== null) { if (($value = $filter->filterGet($this, $fieldName, $value)) !== null) {
return $value; return $value;
} }
...@@ -952,7 +967,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count ...@@ -952,7 +967,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
{ {
if (isset($this->_data[$fieldName])) { if (isset($this->_data[$fieldName])) {
if ($value instanceof Doctrine_Record) { if ($value instanceof Doctrine_Record) {
$type = $this->_table->getTypeOf($fieldName); $type = $this->_class->getTypeOf($fieldName);
$id = $value->getIncremented(); $id = $value->getIncremented();
if ($id !== null && $type !== 'object') { if ($id !== null && $type !== 'object') {
$value = $id; $value = $id;
...@@ -985,7 +1000,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count ...@@ -985,7 +1000,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
try { try {
$this->_coreSetRelated($fieldName, $value); $this->_coreSetRelated($fieldName, $value);
} catch (Doctrine_Relation_Exception $e) { } catch (Doctrine_Relation_Exception $e) {
foreach ($this->_table->getFilters() as $filter) { foreach ($this->_class->getFilters() as $filter) {
if (($value = $filter->filterSet($this, $fieldName, $value)) !== null) { if (($value = $filter->filterSet($this, $fieldName, $value)) !== null) {
return $value; return $value;
} }
...@@ -1000,7 +1015,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count ...@@ -1000,7 +1015,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
*/ */
private function _coreSetRelated($name, $value) private function _coreSetRelated($name, $value)
{ {
$rel = $this->_table->getRelation($name); $rel = $this->_class->getRelation($name);
// one-to-many or one-to-one relation // one-to-many or one-to-one relation
if ($rel instanceof Doctrine_Relation_ForeignKey || if ($rel instanceof Doctrine_Relation_ForeignKey ||
...@@ -1069,7 +1084,6 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count ...@@ -1069,7 +1084,6 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
} }
if (isset($this->_references[$fieldName]) && if (isset($this->_references[$fieldName]) &&
$this->_references[$fieldName] !== self::$_null) { $this->_references[$fieldName] !== self::$_null) {
return true; return true;
} }
return false; return false;
...@@ -1094,8 +1108,8 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count ...@@ -1094,8 +1108,8 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
} }
/** /**
* Applies the changes made to this object into database. * Saves the current state of the entity into the database.
* This method also saves the related components. * This method also saves associated entities.
* *
* @param Doctrine_Connection $conn optional connection parameter * @param Doctrine_Connection $conn optional connection parameter
* @return void * @return void
...@@ -1147,7 +1161,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count ...@@ -1147,7 +1161,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
$conn = $this->_mapper->getConnection(); $conn = $this->_mapper->getConnection();
} }
return $conn->replace($this->_table, $this->getPrepared(), $this->_id); return $conn->replace($this->_class, $this->getPrepared(), $this->_id);
} }
/** /**
...@@ -1195,7 +1209,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count ...@@ -1195,7 +1209,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
} }
foreach ($modifiedFields as $field) { foreach ($modifiedFields as $field) {
$type = $this->_table->getTypeOf($field); $type = $this->_class->getTypeOf($field);
if ($this->_data[$field] === self::$_null) { if ($this->_data[$field] === self::$_null) {
$dataSet[$field] = null; $dataSet[$field] = null;
...@@ -1214,7 +1228,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count ...@@ -1214,7 +1228,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
$dataSet[$field] = $this->getTable()->getConnection()->convertBooleans($this->_data[$field]); $dataSet[$field] = $this->getTable()->getConnection()->convertBooleans($this->_data[$field]);
break; break;
case 'enum': case 'enum':
$dataSet[$field] = $this->_table->enumIndex($field, $this->_data[$field]); $dataSet[$field] = $this->_class->enumIndex($field, $this->_data[$field]);
break; break;
default: default:
if ($this->_data[$field] instanceof Doctrine_Record) { if ($this->_data[$field] instanceof Doctrine_Record) {
...@@ -1232,10 +1246,10 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count ...@@ -1232,10 +1246,10 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
// @todo cleanup // @todo cleanup
// populates the discriminator field in Single & Class Table Inheritance // populates the discriminator field in Single & Class Table Inheritance
if ($this->_table->getInheritanceType() == Doctrine::INHERITANCETYPE_JOINED || if ($this->_class->getInheritanceType() == Doctrine::INHERITANCETYPE_JOINED ||
$this->_table->getInheritanceType() == Doctrine::INHERITANCETYPE_SINGLE_TABLE) { $this->_class->getInheritanceType() == Doctrine::INHERITANCETYPE_SINGLE_TABLE) {
$discCol = $this->_table->getInheritanceOption('discriminatorColumn'); $discCol = $this->_class->getInheritanceOption('discriminatorColumn');
$discMap = $this->_table->getInheritanceOption('discriminatorMap'); $discMap = $this->_class->getInheritanceOption('discriminatorMap');
$old = $this->get($discCol, false); $old = $this->get($discCol, false);
$discValue = array_search($this->_entityName, $discMap); $discValue = array_search($this->_entityName, $discMap);
if ((string) $old !== (string) $discValue || $old === null) { if ((string) $old !== (string) $discValue || $old === null) {
...@@ -1278,8 +1292,8 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count ...@@ -1278,8 +1292,8 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
$a[$column] = $value; $a[$column] = $value;
} }
if ($this->_table->getIdentifierType() == Doctrine::IDENTIFIER_AUTOINC) { if ($this->_class->getIdentifierType() == Doctrine::IDENTIFIER_AUTOINC) {
$idFieldNames = (array)$this->_table->getIdentifier(); $idFieldNames = (array)$this->_class->getIdentifier();
$id = $idFieldNames[0]; $id = $idFieldNames[0];
$a[$id] = $this->getIncremented(); $a[$id] = $this->getIncremented();
} }
...@@ -1434,13 +1448,14 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count ...@@ -1434,13 +1448,14 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
* *
* @param mixed $name name of the property or reference * @param mixed $name name of the property or reference
* @return boolean * @return boolean
* @todo Method name does not reflect the purpose.
*/ */
public function hasRelation($fieldName) public function hasRelation($fieldName)
{ {
if (isset($this->_data[$fieldName]) || isset($this->_id[$fieldName])) { if (isset($this->_data[$fieldName]) || isset($this->_id[$fieldName])) {
return true; return true;
} }
return $this->_table->hasRelation($fieldName); return $this->_class->hasRelation($fieldName);
} }
/** /**
...@@ -1473,8 +1488,8 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count ...@@ -1473,8 +1488,8 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
{ {
$data = $this->_data; $data = $this->_data;
if ($this->_table->getIdentifierType() === Doctrine::IDENTIFIER_AUTOINC) { if ($this->_class->getIdentifierType() === Doctrine::IDENTIFIER_AUTOINC) {
$idFieldNames = (array)$this->_table->getIdentifier(); $idFieldNames = (array)$this->_class->getIdentifier();
$id = $idFieldNames[0]; $id = $idFieldNames[0];
unset($data[$id]); unset($data[$id]);
} }
...@@ -1528,7 +1543,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count ...@@ -1528,7 +1543,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
$this->_data[$fieldName] = $value; $this->_data[$fieldName] = $value;
} }
} else { } else {
$idFieldNames = (array)$this->_table->getIdentifier(); $idFieldNames = (array)$this->_class->getIdentifier();
$name = $idFieldNames[0]; $name = $idFieldNames[0];
$this->_id[$name] = $id; $this->_id[$name] = $id;
$this->_data[$name] = $id; $this->_data[$name] = $id;
...@@ -1568,6 +1583,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count ...@@ -1568,6 +1583,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
* hasRefence * hasRefence
* @param string $name * @param string $name
* @return boolean * @return boolean
* @todo Better name? hasAssociation() ?
*/ */
public function hasReference($name) public function hasReference($name)
{ {
...@@ -1630,7 +1646,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count ...@@ -1630,7 +1646,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
*/ */
public function loadReference($name) public function loadReference($name)
{ {
$rel = $this->_table->getRelation($name); $rel = $this->_class->getRelation($name);
$this->_references[$name] = $rel->fetchRelatedFor($this); $this->_references[$name] = $rel->fetchRelatedFor($this);
} }
...@@ -1641,6 +1657,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count ...@@ -1641,6 +1657,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
* @param string $column column name * @param string $column column name
* @param mixed arg1 ... argN optional callback arguments * @param mixed arg1 ... argN optional callback arguments
* @return Doctrine_Record * @return Doctrine_Record
* @todo Really needed/used? If not, remove.
*/ */
public function call($callback, $column) public function call($callback, $column)
{ {
...@@ -1666,7 +1683,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count ...@@ -1666,7 +1683,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
*/ */
public function getNode() public function getNode()
{ {
if ( ! $this->_table->isTree()) { if ( ! $this->_class->isTree()) {
return false; return false;
} }
...@@ -1691,7 +1708,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count ...@@ -1691,7 +1708,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
*/ */
public function revert($version) public function revert($version)
{ {
$data = $this->_table $data = $this->_class
->getBehavior('Doctrine_Template_Versionable') ->getBehavior('Doctrine_Template_Versionable')
->getAuditLog() ->getAuditLog()
->getVersion($this, $version); ->getVersion($this, $version);
...@@ -1707,7 +1724,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count ...@@ -1707,7 +1724,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
public function unshiftFilter(Doctrine_Record_Filter $filter) public function unshiftFilter(Doctrine_Record_Filter $filter)
{ {
return $this->_table->unshiftFilter($filter); return $this->_class->unshiftFilter($filter);
} }
/** /**
...@@ -1854,15 +1871,15 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count ...@@ -1854,15 +1871,15 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
*/ */
public function __call($method, $args) public function __call($method, $args)
{ {
if (($behavior = $this->_table->getBehaviorForMethod($method)) !== false) { if (($behavior = $this->_class->getBehaviorForMethod($method)) !== false) {
$behavior->setInvoker($this); $behavior->setInvoker($this);
return call_user_func_array(array($behavior, $method), $args); return call_user_func_array(array($behavior, $method), $args);
} }
foreach ($this->_table->getBehaviors() as $behavior) { foreach ($this->_class->getBehaviors() as $behavior) {
if (method_exists($behavior, $method)) { if (method_exists($behavior, $method)) {
$behavior->setInvoker($this); $behavior->setInvoker($this);
$this->_table->addBehaviorMethod($method, $behavior); $this->_class->addBehaviorMethod($method, $behavior);
return call_user_func_array(array($behavior, $method), $args); return call_user_func_array(array($behavior, $method), $args);
} }
} }
...@@ -1880,6 +1897,39 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count ...@@ -1880,6 +1897,39 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
$this->getNode()->delete(); $this->getNode()->delete();
} }
/**
* getTable
* returns the table object for this record
*
* @return Doctrine_Table a Doctrine_Table object
* @deprecated
*/
public function getTable()
{
return $this->getClassMetadata();
}
/**
* Gets the ClassMetadata object that describes the entity class.
*/
public function getClassMetadata()
{
return $this->_class;
}
/**
* Returns the mapper of the entity.
*
* @return Doctrine_Mapper
*/
public function getMapper()
{
return $this->_mapper;
}
/**
* @todo Why toString() and __toString() ?
*/
public function toString() public function toString()
{ {
return Doctrine::dump(get_object_vars($this)); return Doctrine::dump(get_object_vars($this));
...@@ -1887,6 +1937,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count ...@@ -1887,6 +1937,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
/** /**
* returns a string representation of this object * returns a string representation of this object
* @todo Why toString() and __toString() ?
*/ */
public function __toString() public function __toString()
{ {
......
lib/Doctrine/Record/Abstract.php deleted 100644 → 0
View file @ d3a26152
<?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.org>.
*/
Doctrine::autoload('Doctrine_Access');
/**
* Doctrine_Record_Abstract
*
* @package Doctrine
* @subpackage Record
* @author Konsta Vesterinen <kvesteri@cc.hut.fi>
* @license http://www.opensource.org/licenses/lgpl-license.php LGPL
* @link www.phpdoctrine.org
* @since 1.0
* @version $Revision$
*/
abstract class Doctrine_Record_Abstract extends Doctrine_Access
{
/**
* The metadata container that describes the entity class.
*
* @param Doctrine_ClassMetadata
*/
protected $_table;
/**
*
* @var Doctrine_Mapper
*/
protected $_mapper;
/**
* @deprecated
*/
public function setTableDefinition()
{}
/**
* @deprecated
*/
public function setUp()
{}
/**
* getTable
* returns the table object for this record
*
* @return Doctrine_Table a Doctrine_Table object
* @deprecated
*/
public function getTable()
{
return $this->getClassMetadata();
}
/**
* Gets the ClassMetadata object that describes the entity class.
*/
public function getClassMetadata()
{
return $this->_table;
}
/**
* Returns the mapper of the entity.
*
* @return Doctrine_Mapper
*/
public function getMapper()
{
return $this->_mapper;
}
/**
* addListener
*
* @param Doctrine_EventListener_Interface|Doctrine_Overloadable $listener
* @return Doctrine_Record
*/
public function addListener($listener, $name = null)
{
$this->_table->addRecordListener($listener, $name = null);
return $this;
}
/**
* getListener
*
* @return Doctrine_EventListener_Interface|Doctrine_Overloadable
*/
public function getListener()
{
return $this->_table->getRecordListener();
}
/**
* setListener
*
* @param Doctrine_EventListener_Interface|Doctrine_Overloadable $listener
* @return Doctrine_Record
*/
public function setListener($listener)
{
$this->_table->setRecordListener($listener);
return $this;
}
public function setAttribute($attr, $value)
{
$this->_table->setAttribute($attr, $value);
}
/**
* 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);
}
}
}
lib/Doctrine/Relation/Association.php
View file @ 71ed9242
...@@ -97,7 +97,7 @@ class Doctrine_Relation_Association extends Doctrine_Relation ...@@ -97,7 +97,7 @@ class Doctrine_Relation_Association extends Doctrine_Relation
$id = $record->getIncremented(); $id = $record->getIncremented();
//var_dump($id); //var_dump($id);
//echo "<br /><br />"; //echo "<br /><br />";
if (empty($id) || ! $this->_foreignMapper->getAttribute(Doctrine::ATTR_LOAD_REFERENCES)) { if (empty($id) || ! $this->_foreignMapper->getClassMetadata()->getAttribute(Doctrine::ATTR_LOAD_REFERENCES)) {
//echo "here" . $this->_foreignMapper->getAttribute(Doctrine::ATTR_LOAD_REFERENCES); //echo "here" . $this->_foreignMapper->getAttribute(Doctrine::ATTR_LOAD_REFERENCES);
$coll = new Doctrine_Collection($this->getForeignComponentName()); $coll = new Doctrine_Collection($this->getForeignComponentName());
} else { } else {
......
lib/Doctrine/Relation/ForeignKey.php
View file @ 71ed9242
...@@ -55,7 +55,7 @@ class Doctrine_Relation_ForeignKey extends Doctrine_Relation ...@@ -55,7 +55,7 @@ class Doctrine_Relation_ForeignKey extends Doctrine_Relation
if ($this->isOneToOne()) { if ($this->isOneToOne()) {
if ( ! $record->exists() || empty($id) || if ( ! $record->exists() || empty($id) ||
! $this->_foreignMapper->getAttribute(Doctrine::ATTR_LOAD_REFERENCES)) { ! $this->_foreignMapper->getClassMetadata()->getAttribute(Doctrine::ATTR_LOAD_REFERENCES)) {
$related = $this->_foreignMapper->create(); $related = $this->_foreignMapper->create();
} else { } else {
$dql = 'FROM ' . $this->_foreignMapper->getComponentName() $dql = 'FROM ' . $this->_foreignMapper->getComponentName()
...@@ -69,7 +69,7 @@ class Doctrine_Relation_ForeignKey extends Doctrine_Relation ...@@ -69,7 +69,7 @@ class Doctrine_Relation_ForeignKey extends Doctrine_Relation
$record, false); $record, false);
} else { } else {
if ( ! $record->exists() || empty($id) || if ( ! $record->exists() || empty($id) ||
! $this->_foreignMapper->getAttribute(Doctrine::ATTR_LOAD_REFERENCES)) { ! $this->_foreignMapper->getClassMetadata()->getAttribute(Doctrine::ATTR_LOAD_REFERENCES)) {
$related = new Doctrine_Collection($this->_foreignMapper->getComponentName()); $related = new Doctrine_Collection($this->_foreignMapper->getComponentName());
} else { } else {
$query = $this->getRelationDql(1); $query = $this->getRelationDql(1);
......
lib/Doctrine/Relation/LocalKey.php
View file @ 71ed9242
...@@ -46,7 +46,7 @@ class Doctrine_Relation_LocalKey extends Doctrine_Relation ...@@ -46,7 +46,7 @@ class Doctrine_Relation_LocalKey extends Doctrine_Relation
$localFieldName = $record->getTable()->getFieldName($this->definition['local']); $localFieldName = $record->getTable()->getFieldName($this->definition['local']);
$id = $record->get($localFieldName); $id = $record->get($localFieldName);
if (empty($id) || ! $this->_foreignMapper->getAttribute(Doctrine::ATTR_LOAD_REFERENCES)) { if (empty($id) || ! $this->_foreignMapper->getClassMetadata()->getAttribute(Doctrine::ATTR_LOAD_REFERENCES)) {
$related = $this->_foreignMapper->create(); $related = $this->_foreignMapper->create();
} else { } else {
$dql = 'FROM ' . $this->getTable()->getComponentName() $dql = 'FROM ' . $this->getTable()->getComponentName()
......
lib/Doctrine/Relation/Nest.php
View file @ 71ed9242
...@@ -105,7 +105,7 @@ class Doctrine_Relation_Nest extends Doctrine_Relation_Association ...@@ -105,7 +105,7 @@ class Doctrine_Relation_Nest extends Doctrine_Relation_Association
$id = $record->getIncremented(); $id = $record->getIncremented();
if (empty($id) || ! $this->_foreignMapper->getAttribute(Doctrine::ATTR_LOAD_REFERENCES)) { if (empty($id) || ! $this->_foreignMapper->getClassMetadata()->getAttribute(Doctrine::ATTR_LOAD_REFERENCES)) {
return new Doctrine_Collection($this->getForeignComponentName()); return new Doctrine_Collection($this->getForeignComponentName());
} else { } else {
......
lib/Doctrine/Table.php deleted 100644 → 0
View file @ d3a26152
<?php
/**
* A table object holds all the information (meta data) of a database table and it's relations
* These informations are needed for the proper object-relational mapping of the domain classes.
*
* @package Doctrine
* @author Roman Borschel <roman@code-factory.org>
* @todo Remove or is there use for such a class in the DBAL?
*/
class Doctrine_Table extends Doctrine_Configurable implements Serializable
{
/**
* The name of the domain class that is mapped to the database table with this metadata.
* Note: In Single Table Inheritance this will be the name of the root class of the
* hierarchy (the one that gets the database table).
*/
protected $_domainClassName;
protected $_conn;
/**
* @var mixed $identifier The field names of all fields that are part of the identifier/primary key
* of the described component.
*/
protected $_identifier = array();
/**
* The identifier type of the component.
*
* @see Doctrine_Identifier constants
* @var integer $identifierType
*/
protected $_identifierType;
/**
*
*/
protected $_inheritanceType = Doctrine::INHERITANCETYPE_TABLE_PER_CLASS;
/**
* @see Doctrine_Template
* @var array $_templates an array containing all templates attached to this table
*/
protected $_templates = array();
/**
* @see Doctrine_Record_Filter
* @var array $_filters an array containing all record filters attached to this table
*/
protected $_filters = array();
/**
* @see Doctrine_Record_Generator
* @var array $_generators an array containing all generators attached to this table
*/
protected $_generators = array();
/**
* @var array $columns an array of column definitions,
* keys are column names and values are column definitions
*
* the definition array has atleast the following values:
*
* -- type the column type, eg. 'integer'
* -- length the column length, eg. 11
*
* additional keys:
* -- notnull whether or not the column is marked as notnull
* -- values enum values
* -- notblank notblank validator + notnull constraint
* ... many more
*/
protected $_columns = array();
/**
* @var array $_fieldNames an array of field names. used to look up field names
* from column names.
* keys are column names and values are field names
*/
protected $_fieldNames = array();
/**
*
* @var array $_columnNames an array of column names
* keys are field names and values column names.
* used to look up column names from field names.
* this is the reverse lookup map of $_fieldNames.
*/
protected $_columnNames = array();
/**
* @var Doctrine_Tree $tree tree object associated with this table
*/
protected $_tree;
/**
* @var integer $columnCount cached column count, Doctrine_Record uses this column count in when
* determining its state
*/
protected $columnCount;
/**
* @var boolean $hasDefaultValues whether or not this table has default values
*/
protected $hasDefaultValues;
/**
* @var Doctrine_Relation_Parser $_parser relation parser object
*/
protected $_parser;
/**
* @var array $options an array containing all options
*
* -- name name of the component, for example component name of the GroupTable is 'Group'
*
* -- parents the parent classes of this component
*
* -- declaringClass name of the table definition declaring class (when using inheritance the class
* that defines the table structure can be any class in the inheritance hierarchy,
* hence we need reflection to check out which class actually calls setTableDefinition)
*
* -- tableName database table name, in most cases this is the same as component name but in some cases
* where one-table-multi-class inheritance is used this will be the name of the inherited table
*
* -- sequenceName Some databases need sequences instead of auto incrementation primary keys,
* you can set specific sequence for your table by calling setOption('sequenceName', $seqName)
* where $seqName is the name of the desired sequence
*
* -- enumMap enum value arrays
*
* -- inheritanceMap contains the mapping of the discriminator column (which discriminator value identifies
* which class). Used in Single & Class Table Inheritance.
*
* -- type table type (mysql example: INNODB)
*
* -- charset character set
*
* -- foreignKeys the foreign keys of this table
*
* -- checks the check constraints of this table, eg. 'price > dicounted_price'
*
* -- collation collation attribute
*
* -- indexes the index definitions of this table
*
* -- treeImpl the tree implementation of this table (if any)
*
* -- treeOptions the tree options
*
* -- queryParts the bound query parts
*
* -- versioning
*/
protected $_options = array(
'tableName' => null,
'sequenceName' => null,
'inheritanceType' => null,
'inheritanceMap' => array(),
'enumMap' => array(),
'type' => null,
'charset' => null,
'collation' => null,
'collate' => null,
'treeImpl' => null,
'treeOptions' => null,
'subclasses' => null,
'queryParts' => array(),
'indexes' => array(),
'parents' => array(),
'joinedParents' => array()
);
/**
* Constructs a new table object.
*/
public function __construct($domainClassName, Doctrine_Connection $conn)
{
$this->_domainClassName = $domainClassName;
$this->_conn = $conn;
$this->_parser = new Doctrine_Relation_Parser($this);
$this->_filters[] = new Doctrine_Record_Filter_Standard();
$this->setParent($this->_conn);
}
public function getConnection()
{
return $this->_conn;
}
/**
* Gets the owner of a column.
* The owner of a column is the name of the component in a hierarchy that
* defines the column.
*
* @param string $columnName The column name
* @return string The name of the owning/defining component
*/
public function getColumnOwner($columnName)
{
if (isset($this->_columns[$columnName]['owner'])) {
return $this->_columns[$columnName]['owner'];
} else {
return $this->getComponentName();
}
}
/**
* getComponentName
*
* @return void
*/
public function getComponentName()
{
//return $this->_options['name'];
return $this->_domainClassName;
}
/**
* Checks whether a column is inherited from a component further up in the hierarchy.
*
* @param $columnName The column name
* @return boolean TRUE if column is inherited, FALSE otherwise.
*/
public function isInheritedColumn($columnName)
{
return (isset($this->_columns[$columnName]['owner']));
}
/**
* Checks whether a field is part of the table identifier/primary key field(s).
*
* @param string $fieldName The field name
* @return boolean TRUE if the field is part of the table identifier/primary key field(s),
* FALSE otherwise.
*/
public function isIdentifier($fieldName)
{
return ($fieldName === $this->getIdentifier() ||
in_array($fieldName, (array) $this->getIdentifier()));
}
/**
* addForeignKey
*
* adds a foreignKey to this table
*
* @return void
*/
public function addForeignKey(array $definition)
{
$this->_options['foreignKeys'][] = $definition;
}
/**
* addCheckConstraint
*
* adds a check constraint to this table
*
* @return void
*/
public function addCheckConstraint($definition, $name)
{
if (is_string($name)) {
$this->_options['checks'][$name] = $definition;
} else {
$this->_options['checks'][] = $definition;
}
return $this;
}
/**
* addIndex
*
* adds an index to this table
*
* @return void
*/
public function addIndex($index, array $definition)
{
$this->_options['indexes'][$index] = $definition;
}
/**
* getIndex
*
* @return array|boolean array on success, FALSE on failure
*/
public function getIndex($index)
{
if (isset($this->_options['indexes'][$index])) {
return $this->_options['indexes'][$index];
}
return false;
}
/**
* setOption
* sets an option and returns this object in order to
* allow flexible method chaining
*
* @see Doctrine_Table::$_options for available options
* @param string $name the name of the option to set
* @param mixed $value the value of the option
* @return Doctrine_Table this object
*/
public function setOption($name, $value)
{
switch ($name) {
case 'name':
case 'tableName':
break;
case 'enumMap':
case 'inheritanceMap':
case 'index':
case 'treeOptions':
if ( ! is_array($value)) {
throw new Doctrine_Table_Exception($name . ' should be an array.');
}
break;
}
$this->_options[$name] = $value;
}
/**
* getOption
* returns the value of given option
*
* @param string $name the name of the option
* @return mixed the value of given option
*/
public function getOption($name)
{
if (isset($this->_options[$name])) {
return $this->_options[$name];
}
return null;
}
/**
* getOptions
* returns all options of this table and the associated values
*
* @return array all options and their values
*/
public function getOptions()
{
return $this->_options;
}
/**
* getColumnName
*
* returns a column name for column alias
* if the actual name for the alias cannot be found
* this method returns the given alias
*
* @param string $alias column alias
* @return string column name
*/
public function getColumnName($fieldName)
{
if (isset($this->_columnNames[$fieldName])) {
return $this->_columnNames[$fieldName];
}
return $fieldName;
}
/**
*
*
*/
public function getColumnDefinition($columnName)
{
if ( ! isset($this->_columns[$columnName])) {
return false;
}
return $this->_columns[$columnName];
}
/**
* getColumnAlias
*
* returns a column alias for a column name
* if no alias can be found the column name is returned.
*
* @param string $columnName column name
* @return string column alias
*/
public function getFieldName($columnName)
{
if (isset($this->_fieldNames[$columnName])) {
return $this->_fieldNames[$columnName];
}
return $columnName;
}
public function setColumns(array $definitions)
{
foreach ($definitions as $name => $options) {
$this->setColumn($name, $options['type'], $options['length'], $options);
}
}
/**
* setColumn
*
* @param string $name
* @param string $type
* @param integer $length
* @param mixed $options
* @param boolean $prepend Whether to prepend or append the new column to the column list.
* By default the column gets appended.
* @throws Doctrine_Table_Exception if trying use wrongly typed parameter
* @return void
*/
public function setColumn($name, $type, $length = null, $options = array(), $prepend = false)
{
if (is_string($options)) {
$options = explode('|', $options);
}
foreach ($options as $k => $option) {
if (is_numeric($k)) {
if ( ! empty($option)) {
$options[$option] = true;
}
unset($options[$k]);
}
}
// extract column name & field name
$parts = explode(' as ', $name);
if (count($parts) > 1) {
$fieldName = $parts[1];
} else {
$fieldName = $parts[0];
}
$name = strtolower($parts[0]);
if (isset($this->_columnNames[$fieldName])) {
return;
}
if ($prepend) {
$this->_columnNames = array_merge(array($fieldName => $name), $this->_columnNames);
$this->_fieldNames = array_merge(array($name => $fieldName), $this->_fieldNames);
} else {
$this->_columnNames[$fieldName] = $name;
$this->_fieldNames[$name] = $fieldName;
}
if ($length == null) {
switch ($type) {
case 'string':
case 'clob':
case 'float':
case 'integer':
case 'array':
case 'object':
case 'blob':
case 'gzip':
// use php int max
$length = 2147483647;
break;
case 'boolean':
$length = 1;
case 'date':
// YYYY-MM-DD ISO 8601
$length = 10;
case 'time':
// HH:NN:SS+00:00 ISO 8601
$length = 14;
case 'timestamp':
// YYYY-MM-DDTHH:MM:SS+00:00 ISO 8601
$length = 25;
break;
}
}
$options['type'] = $type;
$options['length'] = $length;
if ($prepend) {
$this->_columns = array_merge(array($name => $options), $this->_columns);
} else {
$this->_columns[$name] = $options;
}
if ( ! empty($options['primary'])) {
if (isset($this->_identifier)) {
$this->_identifier = $this->_identifier;
}
if ( ! in_array($fieldName, (array) $this->_identifier)) {
$this->_identifier[] = $fieldName;
}
}
if (isset($options['default'])) {
$this->hasDefaultValues = true;
}
$this->columnCount++;
}
/**
* hasDefaultValues
* returns true if this table has default values, otherwise false
*
* @return boolean
*/
public function hasDefaultValues()
{
return $this->hasDefaultValues;
}
/**
* getDefaultValueOf
* returns the default value(if any) for given column
*
* @param string $fieldName
* @return mixed
*/
public function getDefaultValueOf($fieldName)
{
$columnName = $this->getColumnName($fieldName);
if ( ! isset($this->_columns[$columnName])) {
throw new Doctrine_Table_Exception("Couldn't get default value. Column ".$columnName." doesn't exist.");
}
if (isset($this->_columns[$columnName]['default'])) {
return $this->_columns[$columnName]['default'];
} else {
return null;
}
}
/**
* @return mixed
*/
public function getIdentifier()
{
return $this->_identifier;
}
public function setIdentifier($identifier)
{
$this->_identifier = $identifier;
}
/**
* @return integer
*/
public function getIdentifierType()
{
return $this->_identifierType;
}
public function setIdentifierType($type)
{
$this->_identifierType = $type;
}
/**
* hasColumn
* @return boolean
*/
public function hasColumn($columnName)
{
return isset($this->_columns[$columnName]);
}
/**
* hasField
* @return boolean
*/
public function hasField($fieldName)
{
return isset($this->_columnNames[$fieldName]);
}
/**
* @param string $fieldName
* @return array
*/
public function getEnumValues($fieldName)
{
$columnName = $this->getColumnName($fieldName);
if (isset($this->_columns[$columnName]['values'])) {
return $this->_columns[$columnName]['values'];
} else {
return array();
}
}
/**
* enumValue
*
* @param string $field
* @param integer $index
* @return mixed
*/
public function enumValue($fieldName, $index)
{
if ($index instanceof Doctrine_Null) {
return $index;
}
$columnName = $this->getColumnName($fieldName);
if ( ! $this->_conn->getAttribute(Doctrine::ATTR_USE_NATIVE_ENUM) &&
isset($this->_columns[$columnName]['values'][$index])) {
return $this->_columns[$columnName]['values'][$index];
}
return $index;
}
/**
* enumIndex
*
* @param string $field
* @param mixed $value
* @return mixed
*/
public function enumIndex($fieldName, $value)
{
$values = $this->getEnumValues($fieldName);
$index = array_search($value, $values);
if ($index === false || ! $this->_conn->getAttribute(Doctrine::ATTR_USE_NATIVE_ENUM)) {
return $index;
}
return $value;
}
/**
* getColumnCount
*
* @return integer the number of columns in this table
*/
public function getColumnCount()
{
return $this->columnCount;
}
/**
* returns all columns and their definitions
*
* @return array
*/
public function getColumns()
{
return $this->_columns;
}
/**
* removeColumn
* removes given column
*
* @return boolean
*/
public function removeColumn($fieldName)
{
$columnName = array_search($fieldName, $this->_fieldNames);
unset($this->_fieldNames[$columnName]);
if (isset($this->_columns[$columnName])) {
unset($this->_columns[$columnName]);
return true;
}
$this->columnCount--;
return false;
}
/**
* returns an array containing all the column names.
*
* @return array
*/
public function getColumnNames(array $fieldNames = null)
{
if ($fieldNames === null) {
return array_keys($this->_columns);
} else {
$columnNames = array();
foreach ($fieldNames as $fieldName) {
$columnNames[] = $this->getColumnName($fieldName);
}
return $columnNames;
}
}
/**
* returns an array with all the identifier column names.
*
* @return array
*/
public function getIdentifierColumnNames()
{
return $this->getColumnNames((array) $this->getIdentifier());
}
/**
* returns an array containing all the field names.
*
* @return array
*/
public function getFieldNames()
{
return array_values($this->_fieldNames);
}
/**
* getDefinitionOf
*
* @return mixed array on success, false on failure
*/
public function getDefinitionOf($fieldName)
{
$columnName = $this->getColumnName($fieldName);
return $this->getColumnDefinition($columnName);
}
/**
* getTypeOf
*
* @return mixed string on success, false on failure
*/
public function getTypeOf($fieldName)
{
return $this->getTypeOfColumn($this->getColumnName($fieldName));
}
/**
* getTypeOfColumn
*
* @return mixed The column type or FALSE if the type cant be determined.
*/
public function getTypeOfColumn($columnName)
{
return isset($this->_columns[$columnName]) ? $this->_columns[$columnName]['type'] : false;
}
/**
* getTableName
*
* @return void
*/
public function getTableName()
{
return $this->_options['tableName'];
}
public function bindRelation($args, $type)
{
return $this->bind($args, $type);
}
/**
* DESCRIBE WHAT THIS METHOD DOES, PLEASE!
*
* @todo Name proposal: addRelation
*/
public function bind($args, $type)
{
$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])) {
$args[2] = array();
} elseif (is_string($args[2])) {
$args[2] = (array) $args[2];
}
$classes = array_merge($this->getOption('parents'), array($this->getComponentName()));
$e = explode('.', $args[1]);
if (in_array($e[0], $classes)) {
if ($options['type'] >= Doctrine_Relation::MANY) {
$options['foreign'] = $e[1];
} else {
$options['local'] = $e[1];
}
} else {
$e2 = explode(' as ', $args[0]);
if ($e[0] !== $e2[0] && ( ! isset($e2[1]) || $e[0] !== $e2[1])) {
$options['refClass'] = $e[0];
}
$options['foreign'] = $e[1];
}
$options = array_merge($args[2], $options);
$this->_parser->bind($args[0], $options);
} else {
$options = array_merge($args[1], $options);
$this->_parser->bind($args[0], $options);
}
}
/**
* hasRelation
*
* @param string $alias the relation to check if exists
* @return boolean true if the relation exists otherwise false
*/
public function hasRelation($alias)
{
return $this->_parser->hasRelation($alias);
}
/**
* getRelation
*
* @param string $alias relation alias
*/
public function getRelation($alias, $recursive = true)
{
return $this->_parser->getRelation($alias, $recursive);
}
public function getRelationParser()
{
return $this->_parser;
}
/**
* getRelations
* returns an array containing all relation objects
*
* @return array an array of Doctrine_Relation objects
*/
public function getRelations()
{
return $this->_parser->getRelations();
}
/**
* getTemplates
* returns all templates attached to this table
*
* @return array an array containing all templates
*/
public function getTemplates()
{
return $this->_templates;
}
public function getInheritanceType()
{
return $this->_inheritanceType;
}
public function setInheritanceType($type)
{
$this->_inheritanceType = $type;
}
/**
* export
* exports this table to database based on column and option definitions
*
* @throws Doctrine_Connection_Exception if some error other than Doctrine::ERR_ALREADY_EXISTS
* occurred during the create table operation
* @return boolean whether or not the export operation was successful
* false if table already existed in the database
*/
public function export()
{
$this->_conn->export->exportTable($this);
}
/**
* getExportableFormat
* Returns an array with the DDL for this table object.
*
* @return array
* @todo move to Table
*/
public function getExportableFormat($parseForeignKeys = true)
{
$columns = array();
$primary = array();
foreach ($this->getColumns() as $name => $definition) {
switch ($definition['type']) {
case 'enum':
if (isset($definition['default'])) {
$definition['default'] = $this->enumIndex($name, $definition['default']);
}
break;
case 'boolean':
if (isset($definition['default'])) {
$definition['default'] = $this->_conn->convertBooleans($definition['default']);
}
break;
}
$columns[$name] = $definition;
if (isset($definition['primary']) && $definition['primary']) {
$primary[] = $name;
}
}
$options['foreignKeys'] = array();
if ($parseForeignKeys && $this->getAttribute(Doctrine::ATTR_EXPORT)
& Doctrine::EXPORT_CONSTRAINTS) {
$constraints = array();
$emptyIntegrity = array('onUpdate' => null,
'onDelete' => null);
foreach ($this->getRelations() as $name => $relation) {
$fk = $relation->toArray();
$fk['foreignTable'] = $relation->getTable()->getTableName();
if ($relation->getTable() === $this && in_array($relation->getLocal(), $primary)) {
if ($relation->hasConstraint()) {
throw new Doctrine_Table_Exception("Badly constructed integrity constraints.");
}
continue;
}
$integrity = array('onUpdate' => $fk['onUpdate'],
'onDelete' => $fk['onDelete']);
if ($relation instanceof Doctrine_Relation_LocalKey) {
$def = array('local' => $relation->getLocal(),
'foreign' => $relation->getForeign(),
'foreignTable' => $relation->getTable()->getTableName());
if (($key = array_search($def, $options['foreignKeys'])) === false) {
$options['foreignKeys'][] = $def;
$constraints[] = $integrity;
} else {
if ($integrity !== $emptyIntegrity) {
$constraints[$key] = $integrity;
}
}
}
}
foreach ($constraints as $k => $def) {
$options['foreignKeys'][$k] = array_merge($options['foreignKeys'][$k], $def);
}
}
$options['primary'] = $primary;
return array('tableName' => $this->getOption('tableName'),
'columns' => $columns,
'options' => array_merge($this->getOptions(), $options));
}
/**
* getTemplate
*
* @param string $template
* @return void
*/
public function getTemplate($template)
{
if ( ! isset($this->_templates[$template])) {
throw new Doctrine_Table_Exception('Template ' . $template . ' not loaded');
}
return $this->_templates[$template];
}
public function hasTemplate($template)
{
return isset($this->_templates[$template]);
}
public function addTemplate($template, Doctrine_Template $impl)
{
$this->_templates[$template] = $impl;
return $this;
}
public function getGenerators()
{
return $this->_generators;
}
public function getGenerator($generator)
{
if ( ! isset($this->_generators[$generator])) {
throw new Doctrine_Table_Exception('Generator ' . $generator . ' not loaded');
}
return $this->_generators[$plugin];
}
public function hasGenerator($generator)
{
return isset($this->_generators[$generator]);
}
public function addGenerator(Doctrine_Record_Generator $generator, $name = null)
{
if ($name === null) {
$this->_generators[] = $generator;
} else {
$this->_generators[$name] = $generator;
}
return $this;
}
/**
* unshiftFilter
*
* @param object Doctrine_Record_Filter $filter
* @return object $this
*/
public function unshiftFilter(Doctrine_Record_Filter $filter)
{
$filter->setTable($this);
$filter->init();
array_unshift($this->_filters, $filter);
return $this;
}
/**
* getTree
*
* getter for associated tree
*
* @return mixed if tree return instance of Doctrine_Tree, otherwise returns false
*/
public function getTree()
{
if ($this->getOption('treeImpl')) {
if ( ! $this->_tree) {
$options = $this->getOption('treeOptions') ? $this->getOption('treeOptions') : array();
$this->_tree = Doctrine_Tree::factory($this,
$this->getOption('treeImpl'), $options);
}
return $this->_tree;
}
return false;
}
/**
* isTree
*
* determine if table acts as tree
*
* @return mixed if tree return true, otherwise returns false
*/
public function isTree()
{
return ( ! is_null($this->getOption('treeImpl'))) ? true : false;
}
/**
* getFilters
*
* @return array $filters
*/
public function getFilters()
{
return $this->_filters;
}
/**
* bindQueryParts
* binds query parts to given component
*
* @param array $queryParts an array of pre-bound query parts
* @return Doctrine_Record this object
*/
public function bindQueryParts(array $queryParts)
{
$this->_options['queryParts'] = $queryParts;
return $this;
}
/**
* bindQueryPart
* binds given value to given query part
*
* @param string $queryPart
* @param mixed $value
* @return Doctrine_Record this object
*/
public function bindQueryPart($queryPart, $value)
{
$this->_options['queryParts'][$queryPart] = $value;
return $this;
}
/**
* getBoundQueryPart
*
* @param string $queryPart
* @return string $queryPart
*/
public function getBoundQueryPart($queryPart)
{
if ( ! isset($this->_options['queryParts'][$queryPart])) {
return null;
}
return $this->_options['queryParts'][$queryPart];
}
/**
* setTableName
*
* @param string $tableName
* @return void
*/
public function setTableName($tableName)
{
$this->setOption('tableName', $this->_conn->formatter->getTableName($tableName));
}
public function serialize()
{
return serialize($this->_columns);
}
public function unserialize($serialized)
{
return true;
}
public function __toString()
{
return spl_object_hash($this);
}
}
lib/Doctrine/Template.php
View file @ 71ed9242
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
* and is licensed under the LGPL. For more information, see * and is licensed under the LGPL. For more information, see
* <http://www.phpdoctrine.org>. * <http://www.phpdoctrine.org>.
*/ */
Doctrine::autoload('Doctrine_Record_Abstract');
/** /**
* Doctrine_Template * Doctrine_Template
* *
...@@ -30,7 +30,7 @@ Doctrine::autoload('Doctrine_Record_Abstract'); ...@@ -30,7 +30,7 @@ Doctrine::autoload('Doctrine_Record_Abstract');
* @version $Revision$ * @version $Revision$
* @author Konsta Vesterinen <kvesteri@cc.hut.fi> * @author Konsta Vesterinen <kvesteri@cc.hut.fi>
*/ */
class Doctrine_Template extends Doctrine_Record_Abstract class Doctrine_Template
{ {
/** /**
* @param Doctrine_Record $_invoker the record that invoked the last delegated call * @param Doctrine_Record $_invoker the record that invoked the last delegated call
......
lib/Doctrine/Transaction.php
View file @ 71ed9242
...@@ -160,7 +160,7 @@ class Doctrine_Transaction extends Doctrine_Connection_Module ...@@ -160,7 +160,7 @@ class Doctrine_Transaction extends Doctrine_Connection_Module
* get the current transaction nesting level * get the current transaction nesting level
* *
* @return integer * @return integer
* @todo Name suggestion: getLevel(). $transaction->getTransactionLevel() looks odd. * @todo Name suggestion: getNestingLevel(). $transaction->getTransactionLevel() looks odd.
*/ */
public function getTransactionLevel() public function getTransactionLevel()
{ {
......
tests/Orm/AllTests.php
View file @ 71ed9242
...@@ -9,6 +9,7 @@ require_once 'lib/DoctrineTestInit.php'; ...@@ -9,6 +9,7 @@ require_once 'lib/DoctrineTestInit.php';
require_once 'Orm/Component/AllTests.php'; require_once 'Orm/Component/AllTests.php';
require_once 'Orm/Ticket/AllTests.php'; require_once 'Orm/Ticket/AllTests.php';
require_once 'Orm/UnitOfWorkTestCase.php'; require_once 'Orm/UnitOfWorkTestCase.php';
require_once 'Orm/ConfigurableTestCase.php';
class Orm_AllTests class Orm_AllTests
{ {
...@@ -22,6 +23,8 @@ class Orm_AllTests ...@@ -22,6 +23,8 @@ class Orm_AllTests
$suite = new Doctrine_OrmTestSuite('Doctrine Orm'); $suite = new Doctrine_OrmTestSuite('Doctrine Orm');
$suite->addTestSuite('Orm_UnitOfWorkTestCase'); $suite->addTestSuite('Orm_UnitOfWorkTestCase');
$suite->addTestSuite('Orm_ConfigurableTestCase');
$suite->addTest(Orm_Component_AllTests::suite()); $suite->addTest(Orm_Component_AllTests::suite());
$suite->addTest(Orm_Ticket_AllTests::suite()); $suite->addTest(Orm_Ticket_AllTests::suite());
......
tests_old/ConfigurableTestCase.php
View file @ 71ed9242
...@@ -173,43 +173,6 @@ class Doctrine_Configurable_TestCase extends Doctrine_UnitTestCase { ...@@ -173,43 +173,6 @@ class Doctrine_Configurable_TestCase extends Doctrine_UnitTestCase {
$this->manager->setAttribute(Doctrine::ATTR_BATCH_SIZE, 5); $this->manager->setAttribute(Doctrine::ATTR_BATCH_SIZE, 5);
$this->assertEqual($this->manager->getAttribute(Doctrine::ATTR_BATCH_SIZE),5); $this->assertEqual($this->manager->getAttribute(Doctrine::ATTR_BATCH_SIZE),5);
$this->manager->setAttribute(Doctrine::ATTR_LOCKMODE, Doctrine::LOCK_PESSIMISTIC);
$this->assertEqual($this->manager->getAttribute(Doctrine::ATTR_LOCKMODE), Doctrine::LOCK_PESSIMISTIC);
// test invalid arguments
/**
try {
$this->manager->setAttribute(Doctrine::ATTR_CACHE_TTL,-12);
} catch(Exception $e) {
$this->assertTrue($e instanceof Exception);
}
try {
$this->manager->setAttribute(Doctrine::ATTR_CACHE_SIZE,-12);
} catch(Exception $e) {
$this->assertTrue($e instanceof Exception);
}
try {
$this->manager->setAttribute(Doctrine::ATTR_BATCH_SIZE,-12);
} catch(Exception $e) {
$this->assertTrue($e instanceof Exception);
}
*/
try {
$this->connection->beginTransaction();
$this->manager->setAttribute(Doctrine::ATTR_LOCKMODE, Doctrine::LOCK_OPTIMISTIC);
} catch(Exception $e) {
$this->assertTrue($e instanceof Exception);
$this->connection->commit();
}
try {
$this->connection->beginTransaction();
$this->connection->setAttribute(Doctrine::ATTR_LOCKMODE, Doctrine::LOCK_PESSIMISTIC);
} catch(Exception $e) {
$this->assertTrue($e instanceof Exception);
$this->connection->commit();
}
} }
public function testGetAttributes() { public function testGetAttributes() {
$this->assertTrue(is_array($this->manager->getAttributes())); $this->assertTrue(is_array($this->manager->getAttributes()));
......
tests_old/HydrateTestCase.php
View file @ 71ed9242
...@@ -60,7 +60,8 @@ class Doctrine_Hydrate_TestCase extends Doctrine_UnitTestCase ...@@ -60,7 +60,8 @@ class Doctrine_Hydrate_TestCase extends Doctrine_UnitTestCase
public function testHydrateHooks() public function testHydrateHooks()
{ {
$user = new User(); $user = new User();
$user->getMapper()->addRecordListener(new HydrationListener); $listener = new HydrationListener;
$user->getClassMetadata()->addRecordListener($listener);
$user->name = 'zYne'; $user->name = 'zYne';
$user->save(); $user->save();
...@@ -72,7 +73,7 @@ class Doctrine_Hydrate_TestCase extends Doctrine_UnitTestCase ...@@ -72,7 +73,7 @@ class Doctrine_Hydrate_TestCase extends Doctrine_UnitTestCase
$this->assertEqual($user->name, 'ZYNE'); $this->assertEqual($user->name, 'ZYNE');
$this->assertEqual($user->password, 'DEFAULT PASS'); $this->assertEqual($user->password, 'DEFAULT PASS');
$user->getClassMetadata()->removeRecordListeners();
} }
} }
class HydrationListener extends Doctrine_Record_Listener class HydrationListener extends Doctrine_Record_Listener
......
tests_old/Record/HookTestCase.php
View file @ 71ed9242
...@@ -79,7 +79,7 @@ class Doctrine_Record_Hook_TestCase extends Doctrine_UnitTestCase ...@@ -79,7 +79,7 @@ class Doctrine_Record_Hook_TestCase extends Doctrine_UnitTestCase
$this->assertEqual($r->pop(), 'preDelete'); $this->assertEqual($r->pop(), 'preDelete');
} }
public function testSoftDelete() /*public function testSoftDelete()
{ {
$r = new SoftDeleteTest(); $r = new SoftDeleteTest();
$r->name = 'something'; $r->name = 'something';
...@@ -99,5 +99,5 @@ class Doctrine_Record_Hook_TestCase extends Doctrine_UnitTestCase ...@@ -99,5 +99,5 @@ class Doctrine_Record_Hook_TestCase extends Doctrine_UnitTestCase
} catch(Doctrine_Exception $e) { } catch(Doctrine_Exception $e) {
$this->fail(); $this->fail();
} }
} }*/
} }
tests_old/models/RecordHookTest.php
View file @ 71ed9242
...@@ -7,35 +7,35 @@ class RecordHookTest extends Doctrine_Record ...@@ -7,35 +7,35 @@ class RecordHookTest extends Doctrine_Record
{ {
$class->setColumn('name', 'string', null, array('primary' => true)); $class->setColumn('name', 'string', null, array('primary' => true));
} }
public function preSave(Doctrine_Event $event) public function preSave()
{ {
$this->_messages[] = __FUNCTION__; $this->_messages[] = __FUNCTION__;
} }
public function postSave(Doctrine_Event $event) public function postSave()
{ {
$this->_messages[] = __FUNCTION__; $this->_messages[] = __FUNCTION__;
} }
public function preInsert(Doctrine_Event $event) public function preInsert()
{ {
$this->_messages[] = __FUNCTION__; $this->_messages[] = __FUNCTION__;
} }
public function postInsert(Doctrine_Event $event) public function postInsert()
{ {
$this->_messages[] = __FUNCTION__; $this->_messages[] = __FUNCTION__;
} }
public function preUpdate(Doctrine_Event $event) public function preUpdate()
{ {
$this->_messages[] = __FUNCTION__; $this->_messages[] = __FUNCTION__;
} }
public function postUpdate(Doctrine_Event $event) public function postUpdate()
{ {
$this->_messages[] = __FUNCTION__; $this->_messages[] = __FUNCTION__;
} }
public function preDelete(Doctrine_Event $event) public function preDelete()
{ {
$this->_messages[] = __FUNCTION__; $this->_messages[] = __FUNCTION__;
} }
public function postDelete(Doctrine_Event $event) public function postDelete()
{ {
$this->_messages[] = __FUNCTION__; $this->_messages[] = __FUNCTION__;
} }
......
tests_old/models/SoftDeleteTest.php
View file @ 71ed9242
...@@ -7,14 +7,14 @@ class SoftDeleteTest extends Doctrine_Record ...@@ -7,14 +7,14 @@ class SoftDeleteTest extends Doctrine_Record
$class->setColumn('something', 'string', '25', array('notnull' => true, 'unique' => true)); $class->setColumn('something', 'string', '25', array('notnull' => true, 'unique' => true));
$class->setColumn('deleted', 'boolean', 1); $class->setColumn('deleted', 'boolean', 1);
} }
public function preDelete(Doctrine_Event $event) /*public function preDelete()
{ {
$event->skipOperation(); $event->skipOperation();
} }
public function postDelete(Doctrine_Event $event) public function postDelete()
{ {
$this->deleted = true; $this->deleted = true;
$this->save(); $this->save();
} }*/
} }
tests_old/run.php
View file @ 71ed9242
...@@ -122,7 +122,6 @@ $core->addTestCase(new Doctrine_Access_TestCase()); ...@@ -122,7 +122,6 @@ $core->addTestCase(new Doctrine_Access_TestCase());
//$core->addTestCase(new Doctrine_Configurable_TestCase()); //$core->addTestCase(new Doctrine_Configurable_TestCase());
$core->addTestCase(new Doctrine_Manager_TestCase()); $core->addTestCase(new Doctrine_Manager_TestCase());
$core->addTestCase(new Doctrine_Connection_TestCase()); $core->addTestCase(new Doctrine_Connection_TestCase());
$core->addTestCase(new Doctrine_Table_TestCase());
$core->addTestCase(new Doctrine_UnitOfWork_TestCase()); $core->addTestCase(new Doctrine_UnitOfWork_TestCase());
//$core->addTestCase(new Doctrine_Collection_TestCase()); //$core->addTestCase(new Doctrine_Collection_TestCase());
$core->addTestCase(new Doctrine_Collection_Snapshot_TestCase()); $core->addTestCase(new Doctrine_Collection_Snapshot_TestCase());
...@@ -259,8 +258,8 @@ $test->addTestCase(new Doctrine_Inheritance_TablePerClass_TestCase()); ...@@ -259,8 +258,8 @@ $test->addTestCase(new Doctrine_Inheritance_TablePerClass_TestCase());
$test->addTestCase(new Doctrine_Metadata_Factory_TestCase()); $test->addTestCase(new Doctrine_Metadata_Factory_TestCase());
// nestedset tests // nestedset tests
$test->addTestCase(new Doctrine_NestedSet_SingleRoot_TestCase()); //$test->addTestCase(new Doctrine_NestedSet_SingleRoot_TestCase());
$test->addTestCase(new Doctrine_NestedSet_LoadInSetUp_TestCase()); //$test->addTestCase(new Doctrine_NestedSet_LoadInSetUp_TestCase());
// Search tests // Search tests
$search = new GroupTest('Search tests','search'); $search = new GroupTest('Search tests','search');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment