diff --git a/manual/en.txt b/manual/en.txt
index 0319f824c..5c79a1bb2 100644
--- a/manual/en.txt
+++ b/manual/en.txt
@@ -12,6 +12,8 @@
+ DQL (Doctrine Query Language)
+ Query Builder
+ Native SQL
++ Change Tracking Policies
++ Partial Objects
+ XML Mapping
+ YAML Mapping
+ Annotations Reference
diff --git a/manual/en/configuration.txt b/manual/en/configuration.txt
index 4431f2124..8b23bbfe2 100644
--- a/manual/en/configuration.txt
+++ b/manual/en/configuration.txt
@@ -245,180 +245,6 @@ or an instance of `Doctrine\DBAL\Connection`. If an array is passed it is direct
DBAL Factory `Doctrine\DBAL\DriverManager::getConnection()`. The DBAL configuration is explained
in the [DBAL section](./../../../../../dbal/2.0/docs/reference/configuration/en).
-++ Change Tracking Policies
-
-Change tracking is the process of determining what has changed in managed
-entities since the last time they were synchronized with the database.
-
-Doctrine provides 3 different change tracking policies, each having its
-particular advantages and disadvantages. The change tracking policy can
-be defined on a per-class basis (or more precisely, per-hierarchy).
-
-+++ Deferred Implicit
-
-The deferred implicit policy is the default change tracking policy and the most
-convenient one. With this policy, Doctrine detects the changes by a
-property-by-property comparison at commit time and also detects changes
-to entities or new entities that are referenced by other managed entities
-("persistence by reachability"). Although the most convenient policy, it can
-have negative effects on performance if you are dealing with large units of
-work (see "Understanding the Unit of Work"). Since Doctrine can't know what
-has changed, it needs to check all managed entities for changes every time you
-invoke EntityManager#flush(), making this operation rather costly.
-
-+++ Deferred Explicit
-
-The deferred explicit policy is similar to the deferred implicit policy in that
-it detects changes through a property-by-property comparison at commit time. The
-difference is that only entities are considered that have been explicitly marked
-for change detection through a call to EntityManager#persist(entity) or through
-a save cascade. All other entities are skipped. This policy therefore gives
-improved performance for larger units of work while sacrificing the behavior
-of "automatic dirty checking".
-
-Therefore, flush() operations are potentially cheaper with this policy. The
-negative aspect this has is that if you have a rather large application and
-you pass your objects through several layers for processing purposes and
-business tasks you may need to track yourself which entities have changed
-on the way so you can pass them to EntityManager#persist().
-
-This policy can be configured as follows:
-
- [php]
- /**
- * @Entity
- * @ChangeTrackingPolicy("DEFERRED_EXPLICIT")
- */
- class User
- {
- // ...
- }
-
-+++ Notify
-
-This policy is based on the assumption that the entities notify interested
-listeners of changes to their properties. For that purpose, a class that
-wants to use this policy needs to implement the NotifyPropertyChanged?
-interface from the Doctrine\Common namespace. As a guideline, such an
-implementation should look as follows:
-
- [php]
- use Doctrine\Common\NotifyPropertyChanged,
- Doctrine\Common\PropertyChangedListener;
-
- /**
- * @Entity
- * @ChangeTrackingPolicy("NOTIFY")
- */
- class MyEntity implements NotifyPropertyChanged
- {
- // ...
-
- private $_listeners = array();
-
- public function addPropertyChangedListener(PropertyChangedListener $listener)
- {
- $this->_listeners[] = $listener;
- }
-
- protected function _onPropertyChanged($propName, $oldValue, $newValue)
- {
- if ($this->_listeners) {
- foreach ($this->_listeners as $listener) {
- $listener->propertyChanged($this, $propName, $oldValue, $newValue);
- }
- }
- }
- }
-
-Then, in each property setter of this class or derived classes, you need to
-invoke `_onPropertyChanged` as follows to notify listeners:
-
- [php]
- // ...
-
- class MyEntity implements NotifyPropertyChanged
- {
- // ...
-
- public function setData($data)
- {
- if ($data != $this->data) {
- $this->_onPropertyChanged('data', $this->data, $data);
- $this->data = $data;
- }
- }
- }
-
-The check whether the new value is different from the old one is not mandatory
-but recommended. That way you also have full control over when you consider a
-property changed.
-
-The negative point of this policy is obvious: You need implement an interface
-and write some plumbing code. But also note that we tried hard to keep this
-notification functionality abstract. Strictly speaking, it has nothing to do
-with the persistence layer and the Doctrine ORM or DBAL. You may find that
-property notification events come in handy in many other scenarios as well.
-As mentioned earlier, the `Doctrine\Common` namespace is not that evil and
-consists solely of very small classes and interfaces that have almost no
-external dependencies (none to the DBAL and none to the ORM) and that you
-can easily take with you should you want to swap out the persistence layer.
-This change tracking policy does not introduce a dependency on the Doctrine
-DBAL/ORM or the persistence layer.
-
-The positive point and main advantage of this policy is its effectiveness. It
-has the best performance characteristics of the 3 policies with larger units of
-work and a flush() operation is very cheap when nothing has changed.
-
-++ Partial Objects
-
-A partial object is an object whose state is not fully initialized after being
-reconstituted from the database and that is disconnected from the rest of its data. The following section will describe why partial objects are problematic and what the approach of Doctrine2 to this problem is.
-
-> **NOTE**
-> The partial object problem in general does not apply to methods or
-> queries where you do not retrieve the query result as objects. Examples are:
-> `Query#getArrayResult()`, `Query#getScalarResult()`, `Query#getSingleScalarResult()`,
-> etc.
-
-+++ What is the problem?
-
-In short, partial objects are problematic because they are usually objects with
-broken invariants. As such, code that uses these partial objects tends to be
-very fragile and either needs to "know" which fields or methods can be safely
-accessed or add checks around every field access or method invocation. The same
-holds true for the internals, i.e. the method implementations, of such objects.
-You usually simply assume the state you need in the method is available, after
-all you properly constructed this object before you pushed it into the database,
-right? These blind assumptions can quickly lead to null reference errors when
-working with such partial objects.
-
-It gets worse with the scenario of an optional association (0..1 to 1). When
-the associated field is NULL, you dont know whether this object does not have
-an associated object or whether it was simply not loaded when the owning object
-was loaded from the database.
-
-These are reasons why many ORMs do not allow partial objects at all and instead
-you always have to load an object with all its fields (associations being proxied).
-One secure way to allow partial objects is if the programming language/platform
-allows the ORM tool to hook deeply into the object and instrument it in such a
-way that individual fields (not only associations) can be loaded lazily on first
-access. This is possible in Java, for example, through bytecode instrumentation.
-In PHP though this is not possible, so there is no way to have "secure" partial
-objects in an ORM with transparent persistence.
-
-Doctrine, by default, does not allow partial objects. That means, any query that only selects partial object data and wants to retrieve the result as objects
-(i.e. `Query#getResult()`) will raise an exception telling you that
-partial objects are dangerous. If you want to force a query to return you partial objects, possibly as a performance tweak, you can use the `partial` keyword as follows:
-
- [php]
- $q = $em->createQuery("select partial u.{id,name} from MyApp\Domain\User u");
-
-+++ When should I force partial objects?
-
-Mainly for optimization purposes, but be careful of premature optimization as partial objects
-lead to potentially more fragile code.
-
++ Proxy Objects
A proxy object is an object that is put in place or used instead of the "real" object. A proxy object can add behavior to the object being proxied without that object being aware of it. In Doctrine 2, proxy objects are used to realize several features but mainly for transparent lazy-loading.
diff --git a/manual/en/xml-mapping.txt b/manual/en/xml-mapping.txt
index 063b2cc89..140308b9c 100644
--- a/manual/en/xml-mapping.txt
+++ b/manual/en/xml-mapping.txt
@@ -15,8 +15,11 @@ The XML driver is backed by an XML Schema document that describes the structure
The XML mapping document of a class is loaded on-demand the first time it is requested and subsequently stored in the metadata cache. In order to work, this requires certain conventions:
* Each entity/mapped superclass must get its own dedicated XML mapping document.
- * The name of the mapping document must consist of the fully qualified name of the class, where namespace separators are replaced by dots (.).
- * All mapping documents should get the extension ".dcm.xml" to identify it as a Doctrine mapping file. This is more of a convention and you are not forced to do this. You can change the file extension easily enough.
+ * The name of the mapping document must consist of the fully qualified name of the class, where namespace
+ separators are replaced by dots (.). For example an Entity with the fully qualified class-name "MyProject\Entities\User"
+ would require a mapping file "MyProject.Entities.User.dcm.xml" unless the extension is changed.
+ * All mapping documents should get the extension ".dcm.xml" to identify it as a Doctrine mapping file. This is more of
+ a convention and you are not forced to do this. You can change the file extension easily enough.
-
@@ -26,8 +29,8 @@ The XML mapping document of a class is loaded on-demand the first time it is req
It is recommended to put all XML mapping documents in a single folder but you can spread the documents over several folders if you want to. In order to tell the XmlDriver where to look for your mapping documents, supply an array of paths as the first argument of the constructor, like this:
[php]
- // $config instanceof Doctrine\ORM\Configuration
- $driver = new \Doctrine\ORM\Mapping\Driver\XmlDriver(array('/path/to/files'));
+ $config = new \Doctrine\ORM\Configuration();
+ $driver = new \Doctrine\ORM\Mapping\Driver\XmlDriver(array('/path/to/files1', '/path/to/files2'));
$config->setMetadataDriverImpl($driver);
@@ -38,46 +41,469 @@ As a quick start, here is a small example document that makes use of several com
[xml]
// Doctrine.Tests.ORM.Mapping.User.dcm.xml
-
+ http://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+
+
+
+
+
+
+
+
+
-
+
+
+
+
-
+
+
-
-
+
+
+
+
+
+
+
+
+
-
+
-
+
+
- Be aware that class-names specified in the XML files should be fully qualified.
\ No newline at end of file
+ Be aware that class-names specified in the XML files should be fully qualified.
+
+++ XML-Element Reference
+
+The XML-Element reference explains all the tags and attributes that the Doctrine Mapping XSD Schema defines.
+You should read the Basic-, Association- and Inheritance Mapping chapters to understand what each of this
+definitions means in detail.
+
++++ Defining an Entity
+
+Each XML Mapping File contains the definition of one entity, specified as the `` element
+as a direct child of the `` element:
+
+ [xml]
+
+
+
+
+
+
+Required attributes:
+
+* name - The fully qualified class-name of the entity.
+
+Optional attributes:
+
+* table - The Table-Name to be used for this entity. Otherwise the Unqualified Class-Name is used by default.
+* repository-class - The fully qualified class-name of an alternative `Doctrine\ORM\EntityRepository` implementation to be used with this entity.
+* inheritance-type - The type of inheritance, defaults to none. A more detailed description follows in the *Defining Inheritance Mappings* section.
+
++++ Defining Fields
+
+Each entity class can contain zero to infinite fields that are managed by Doctrine. You can define
+them using the `` element as a children to the `` element. The field element is only
+used for primitive types that are not the ID of the entity. For the ID mapping you have to use the `` element.
+
+ [xml]
+
+
+
+
+
+
+
+
+
+Required attributes:
+
+* name - The name of the Property/Field on the given Entity PHP class.
+
+Optional attributes:
+
+* type - The `Doctrine\DBAL\Types\Type` name, defaults to "string"
+* column - Name of the column in the database, defaults to the field name.
+* length - The length of the given type, for use with strings only.
+* unique - Should this field contain a unique value across the table? Defaults to false.
+* nullable - Should this field allow NULL as a value? Defaults to false.
+* version - Should this field be used for optimistic locking? Only works on fields with type integer or datetime.
+* scale - Scale of a decimal type.
+* precision - Precision of a decimal type.
+* column-definition - Optional alternative SQL representation for this column. This definition begin after the
+ field-name and has to specify the complete column definition. Using this feature will turn this field dirty
+ for Schema-Tool update commands at all times.
+
++++ Defining Identity and Generator Strategies
+
+An entity has to have at least one `` element. For composite keys you can specify more than one id-element,
+however surrogate keys are recommended for use with Doctrine 2. The Id field allows to define properties of
+the identifier and allows a subset of the `` element attributes:
+
+ [xml]
+
+
+
+
+Required attributes:
+
+* name - The name of the Property/Field on the given Entity PHP class.
+* type - The `Doctrine\DBAL\Types\Type` name, preferably "string" or "integer".
+
+Optional attributes:
+
+* column - Name of the column in the database, defaults to the field name.
+
+Using the simplified definition above Doctrine will use no identifier strategy for this entity. That means
+you have to manually set the identifier before calling `EntityManager#persist($entity)`. This is the
+so called `ASSIGNED` strategy.
+
+If you want to switch the identifier generation strategy you have to nest a `` element inside
+the id-element. This of course only works for surrogate keys. For composite keys you always have to use
+the `ASSIGNED` strategy.
+
+ [xml]
+
+
+
+
+
+
+The following values are allowed for the `` strategy attribute:
+
+* AUTO - Automatic detection of the identifier strategy based on the preferred solution of the database vendor.
+* IDENTITY - Use of a IDENTIFY strategy such as Auto-Increment IDs available to Doctrine AFTER the INSERT statement has been executed.
+* SEQUENCE - Use of a database sequence to retrieve the entity-ids. This is possible before the INSERT statement is executed.
+
+If you are using the SEQUENCE strategy you can define an additional element to describe the sequence:
+
+ [xml]
+
+
+
+
+
+
+
+Required attributes for ``:
+
+* sequence-name - The name of the sequence
+
+Optional attributes for ``:
+
+* allocation-size - By how much steps should the sequence be incremented when a value is retrieved. Defaults to 1
+* initial-value - What should the initial value of the sequence be.
+
+> **NOTE**
+>
+> If you want to implement a cross-vendor compatible application you have to specify and
+> additionaly define the element, if Doctrine chooses the sequence strategy for a platform.
+
++++ Defining a Mapped Superclass
+
+Sometimes you want to define a class that multiple entities inherit from, which itself is not an entity however.
+The chapter on *Inheritance Mapping* describes a Mapped Superclass in detail. You can define it in XML using
+the `` tag.
+
+ [xml]
+
+
+
+
+
+
+
+Required attributes:
+
+* name - Class name of the mapped superclass.
+
+You can nest any number of `` and unidirectional `` or `` associations inside
+a mapped superclass.
+
++++ Defining Inheritance Mappings
+
+There are currently two inheritance persistence strategies that you can choose from when defining entities that
+inherit from each other. Single Table inheritance saves the fields of the complete inheritance hierachy in a single table,
+joined table inheritance creates a table for each entity combining the fields using join conditions.
+
+You can specify the inheritance type in the `` element and then use the `` and
+`` attributes.
+
+ [xml]
+
+
+
+
+
+
+
+
+
+The allowed values for inheritance-type attribute are `JOINED` or `SINGLE_TABLE`.
+
+> **NOTE**
+>
+> All inheritance related definitions have to be defined on the root entity of the hierachy.
+
++++ Defining Lifecycle Callbacks
+
+You can define the lifecycle callback methods on your entities using the `` element:
+
+ [xml]
+
+
+
+
+
+
+
++++ Defining One-To-One Relations
+
+You can define One-To-One Relations/Assocations using the `` element. The required
+and optional attributes depend on the associations being on the inverse or owning side.
+
+For the inverse side the mapping is as simple as:
+
+ [xml]
+
+
+
+
+Required attributes for inverse One-To-One:
+
+* field - Name of the property/field on the entitys PHP class.
+* target-entity - Name of the entity associated entity class. If this is not qualified the namespace of the current class is prepended.
+* mapped-by - Name of the field on the owning side (here Address entity) that contains the owning side association.
+
+For the owning side this mapping would look like:
+
+ [xml]
+
+
+
+
+Required attributes for owning One-to-One:
+
+* field - Name of the property/field on the entitys PHP class.
+* target-entity - Name of the entity associated entity class. If this is not qualified the namespace of the current class is prepended.
+
+Optional attributes for owning One-to-One:
+
+* inversed-by - If the association is bidirectional the inversed-by attribute has to be specified with the name of the field on the inverse entity that contains the back-reference.
+* orphan-removal - If true, the inverse side entity is always deleted when the owning side entity is. Defaults to false.
+* fetch - Either LAZY or FETCH, defaults to LAZY. This attribute makes only sense on the owning side, the inverse side *ALWAYS* has to use the `FETCH` strategy.
+
+The definition for the owning side relies on a bunch of mapping defaults for the join column names.
+Without the nested `` element Doctrine assumes to foreign key to be called `user_id` on the Address
+Entities table. This is because the `MyProject\Address` entity is the owning side of this association, which means
+it contains the foreign key.
+
+The completed explictly defined mapping is:
+
+ [xml]
+
+
+
+
+
+
++++ Defining Many-To-One Associations
+
+The many-to-one association is *ALWAYS* the owning side of any bidirectional association. This simplifies the mapping
+compared to the one-to-one case. The minimal mapping for this association looks like:
+
+ [xml]
+
+
+
+
+Required attributes:
+
+* field - Name of the property/field on the entitys PHP class.
+* target-entity - Name of the entity associated entity class. If this is not qualified the namespace of the current class is prepended.
+
+Optional attributes:
+
+* inversed-by - If the association is bidirectional the inversed-by attribute has to be specified with the name of the field on the inverse entity that contains the back-reference.
+* orphan-removal - If true the entity on the inverse side is always deleted when the owning side entity is and it is not connected to any other owning side entity anymore. Defaults to false.
+* fetch - Either LAZY or FETCH, defaults to LAZY.
+
+This definition relies on a bunch of mapping defaults with regards to the naming of the join-column/foreign key. The
+explictly defined mapping includes a `` tag nested inside the many-to-one association tag:
+
+ [xml]
+
+
+
+
+
+
+The join-column attribute `name` specifies the column name of the foreign key and
+the `referenced-column-name` attribute specifies the name of the primary key column
+on the User entity.
+
++++ Defining One-To-Many Associations
+
+The one-to-many association is *ALWAYS* the inverse side of any association. There exists no such thing as a
+uni-directional one-to-many association, which means this association only ever exists for bi-directional associations.
+
+ [xml]
+
+
+
+
+Required attributes:
+
+* field - Name of the property/field on the entitys PHP class.
+* target-entity - Name of the entity associated entity class. If this is not qualified the namespace of the current class is prepended.
+* mapped-by - Name of the field on the owning side (here Phonenumber entity) that contains the owning side association.
+
+Optional attributes:
+
+* fetch - Either LAZY or FETCH, defaults to LAZY.
+
++++ Defining Many-To-Many Associations
+
+From all the associations the many-to-many has the most complex definition. When you rely on the mapping defaults
+you can omit many definitions and rely on their implicit values.
+
+ [xml]
+
+
+
+
+Required attributes:
+
+* field - Name of the property/field on the entitys PHP class.
+* target-entity - Name of the entity associated entity class. If this is not qualified the namespace of the current class is prepended.
+
+Optional attributes:
+
+* mapped-by - Name of the field on the owning side that contains the owning side association if the defined many-to-many association is on the inverse side.
+* inversed-by - If the association is bidirectional the inversed-by attribute has to be specified with the name of the field on the inverse entity that contains the back-reference.
+* fetch - Either LAZY or FETCH, defaults to LAZY.
+
+The mapping defaults would lead to a join-table with the name "User_Group" being created that contains two columns
+"user_id" and "group_id". The explicit definition of this mapping would be:
+
+ [xml]
+
+
+
+
+
+
+
+
+
+
+
+
+
+Here both the and tags are necessary to tell Doctrine for which side the
+specified join-columns apply. These are nested inside a `` attribute which allows to specify
+the table name of the many-to-many join-table.
+
++++ Cascade Element
+
+Doctrine allows cascading of several UnitOfWork operations to related entities. You can specifiy the cascade
+operations in the `` element inside any of the association mapping tags.
+
+ [xml]
+
+
+
+
+
+
+
+
+Besides `` the following operations can be specifed by their respective tags:
+
+*
+*
+*
+*
+
++++ Join Column Element
+
+In any explicitly defined association mapping you will need the `` tag. It defines how the
+foreign key and primary key names are called that are used for joining two entities.
+
+Required attributes:
+
+* name - The column name of the foreign key.
+* referenced-column-name - The column name of the associated entities primary key
+
+Optional attributes:
+
+* unique - If the join column should contain a UNIQUE constraint. This makes sense for Many-To-Many join-columns only to simulate a one-to-many unidirectional using a join-table.
+* nullable - should the join column be nullable, defaults to true.
+* on-delete - Foreign Key Cascade action to perform when entity is deleted, defaults to NO ACTION/RESTRICT but can be set to "CASCADE".
+
++++ Defining Order of To-Many Associations
+
+You can require one-to-many or many-to-many associations to be retrieved using an additional `ORDER BY`.
+
+ [xml]
+
+
+
+
+
+
+
+
++++ Defining Indexes or Unique Constraints
+
+To define additional indexes or unique constraints on the entities table you can use the
+`` and `` elements:
+
+ [xml]
+
+
+
+
+
+
+
+
+
+
+
+
+You have to specify the column and not the entity-class field names in the index and unique-constraint
+definitions.
\ No newline at end of file