Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[MODM-36] Fixing issues with embedded collections.
- Loading branch information
Showing
8 changed files
with
250 additions
and
79 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
53 changes: 53 additions & 0 deletions
53
lib/Doctrine/ODM/MongoDB/Collection/PersistentEmbeddedCollection.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| <?php | ||
| /* | ||
| * 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.doctrine-project.org>. | ||
| */ | ||
|
|
||
| namespace Doctrine\ODM\MongoDB\Collection; | ||
|
|
||
| use Doctrine\Common\Collections\Collection, | ||
| Doctrine\ODM\MongoDB\Mapping\ClassMetadata, | ||
| Doctrine\ODM\MongoDB\Proxy\Proxy, | ||
| Closure; | ||
|
|
||
| /** | ||
| * A PersistentEmbeddedCollection represents a collection of embedded documents. | ||
| * | ||
| * @license http://www.opensource.org/licenses/lgpl-license.php LGPL | ||
| * @since 1.0 | ||
| * @author Jonathan H. Wage <jonwage@gmail.com> | ||
| * @author Roman Borschel <roman@code-factory.org> | ||
| */ | ||
| final class PersistentEmbeddedCollection extends AbstractPersistentCollection | ||
| { | ||
| protected function _initialize() | ||
| { | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function clear() | ||
| { | ||
| $this->_initialize(); | ||
| $result = $this->_coll->clear(); | ||
| if ($this->_mapping->isOwningSide) { | ||
| $this->_changed(); | ||
| } | ||
| return $result; | ||
| } | ||
| } |
67 changes: 67 additions & 0 deletions
67
lib/Doctrine/ODM/MongoDB/Collection/PersistentReferenceCollection.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| <?php | ||
| /* | ||
| * 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.doctrine-project.org>. | ||
| */ | ||
|
|
||
| namespace Doctrine\ODM\MongoDB\Collection; | ||
|
|
||
| use Doctrine\Common\Collections\Collection, | ||
| Doctrine\ODM\MongoDB\Mapping\ClassMetadata, | ||
| Doctrine\ODM\MongoDB\Proxy\Proxy, | ||
| Closure; | ||
|
|
||
| /** | ||
| * A PersistentReferenceCollection represents a collection of referenced documents. | ||
| * | ||
| * @license http://www.opensource.org/licenses/lgpl-license.php LGPL | ||
| * @since 1.0 | ||
| * @author Jonathan H. Wage <jonwage@gmail.com> | ||
| * @author Roman Borschel <roman@code-factory.org> | ||
| */ | ||
| final class PersistentReferenceCollection extends AbstractPersistentCollection | ||
| { | ||
| /** | ||
| * Initializes the collection by loading its contents from the database | ||
| * if the collection is not yet initialized. | ||
| */ | ||
| protected function _initialize() | ||
| { | ||
| if ( ! $this->_initialized) { | ||
| $groupedIds = array(); | ||
| foreach ($this->_coll as $document) { | ||
| $class = $this->_dm->getClassMetadata(get_class($document)); | ||
| $ids[$class->name][] = $class->getIdentifierObject($document); | ||
| } | ||
|
|
||
| foreach ($groupedIds as $className => $ids) { | ||
| $collection = $this->_dm->getDocumentCollection($className); | ||
| $data = $collection->find(array('_id' => array($this->_cmd . 'in' => $ids))); | ||
| $hints = array(Query::HINT_REFRESH => Query::HINT_REFRESH); | ||
| foreach ($data as $id => $documentData) { | ||
| $document = $this->_dm->getUnitOfWork()->getOrCreateDocument($this->_typeClass->name, $documentData, $hints); | ||
| if ($document instanceof Proxy) { | ||
| $document->__isInitialized__ = true; | ||
| unset($document->__dm); | ||
| unset($document->__identifier); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| $this->_initialized = true; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.