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

#1178 - correcting collection insert/update logic to correctly cast values for custom typed columns

Browse source
This commit is contained in:
Marco Pivetta 2015-01-17 02:48:05 +01:00
parent aaa6443954
commit 91bceca7ee
1 changed files with 44 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
lib/Doctrine/ORM/Persisters/Collection/ManyToManyPersister.php
View file

@ -25,6 +25,7 @@ use Doctrine\ORM\Persisters\SqlExpressionVisitor;
use Doctrine\ORM\Persisters\SqlValueVisitor; use Doctrine\ORM\Persisters\SqlValueVisitor;
use Doctrine\ORM\PersistentCollection; use Doctrine\ORM\PersistentCollection;
use Doctrine\ORM\Query; use Doctrine\ORM\Query;
use Doctrine\ORM\Utility\PersisterHelper;
/** /**
* Persister for many-to-many collections. * Persister for many-to-many collections.
@ -61,15 +62,23 @@ class ManyToManyPersister extends AbstractCollectionPersister
return; // ignore inverse side return; // ignore inverse side
} }
$insertSql = $this->getInsertRowSQL($collection); list($deleteSql, $deleteTypes) = $this->getDeleteRowSQL($collection);
$deleteSql = $this->getDeleteRowSQL($collection); list($insertSql, $insertTypes) = $this->getInsertRowSQL($collection);
foreach ($collection->getDeleteDiff() as $element) { foreach ($collection->getDeleteDiff() as $element) {
$this->conn->executeUpdate($deleteSql, $this->getDeleteRowSQLParameters($collection, $element)); $this->conn->executeUpdate(
$deleteSql,
$this->getDeleteRowSQLParameters($collection, $element),
$deleteTypes
);
} }
foreach ($collection->getInsertDiff() as $element) { foreach ($collection->getInsertDiff() as $element) {
$this->conn->executeUpdate($insertSql, $this->getInsertRowSQLParameters($collection, $element)); $this->conn->executeUpdate(
$insertSql,
$this->getInsertRowSQLParameters($collection, $element),
$insertTypes
);
} }
} }
@ -397,24 +406,32 @@ class ManyToManyPersister extends AbstractCollectionPersister
* *
* @param \Doctrine\ORM\PersistentCollection $collection * @param \Doctrine\ORM\PersistentCollection $collection
* *
* @return string * @return string[]|string[][] ordered tuple containing the SQL to be executed and an array
* of types for bound parameters
*/ */
protected function getDeleteRowSQL(PersistentCollection $collection) protected function getDeleteRowSQL(PersistentCollection $collection)
{ {
$mapping = $collection->getMapping(); $mapping = $collection->getMapping();
$class = $this->em->getClassMetadata($mapping['sourceEntity']); $class = $this->em->getClassMetadata($mapping['sourceEntity']);
$columns = array(); $targetClass = $this->em->getClassMetadata($mapping['targetEntity']);
$columns = array();
$types = array();
foreach ($mapping['joinTable']['joinColumns'] as $joinColumn) { foreach ($mapping['joinTable']['joinColumns'] as $joinColumn) {
$columns[] = $this->quoteStrategy->getJoinColumnName($joinColumn, $class, $this->platform); $columns[] = $this->quoteStrategy->getJoinColumnName($joinColumn, $class, $this->platform);
$types[] = PersisterHelper::getTypeOfColumn($joinColumn['referencedColumnName'], $class, $this->em);
} }
foreach ($mapping['joinTable']['inverseJoinColumns'] as $joinColumn) { foreach ($mapping['joinTable']['inverseJoinColumns'] as $joinColumn) {
$columns[] = $this->quoteStrategy->getJoinColumnName($joinColumn, $class, $this->platform); $columns[] = $this->quoteStrategy->getJoinColumnName($joinColumn, $targetClass, $this->platform);
$types[] = PersisterHelper::getTypeOfColumn($joinColumn['referencedColumnName'], $targetClass, $this->em);
} }
return 'DELETE FROM ' . $this->quoteStrategy->getJoinTableName($mapping, $class, $this->platform) return array(
. ' WHERE ' . implode(' = ? AND ', $columns) . ' = ?'; 'DELETE FROM ' . $this->quoteStrategy->getJoinTableName($mapping, $class, $this->platform)
. ' WHERE ' . implode(' = ? AND ', $columns) . ' = ?',
$types,
);
} }
/** /**
@ -438,26 +455,34 @@ class ManyToManyPersister extends AbstractCollectionPersister
* *
* @param \Doctrine\ORM\PersistentCollection $collection * @param \Doctrine\ORM\PersistentCollection $collection
* *
* @return string * @return string[]|string[][] ordered tuple containing the SQL to be executed and an array
* of types for bound parameters
*/ */
protected function getInsertRowSQL(PersistentCollection $collection) protected function getInsertRowSQL(PersistentCollection $collection)
{ {
$columns = array(); $columns = array();
$mapping = $collection->getMapping(); $types = array();
$class = $this->em->getClassMetadata($mapping['sourceEntity']); $mapping = $collection->getMapping();
$class = $this->em->getClassMetadata($mapping['sourceEntity']);
$targetClass = $this->em->getClassMetadata($mapping['targetEntity']);
foreach ($mapping['joinTable']['joinColumns'] as $joinColumn) { foreach ($mapping['joinTable']['joinColumns'] as $joinColumn) {
$columns[] = $this->quoteStrategy->getJoinColumnName($joinColumn, $class, $this->platform); $columns[] = $this->quoteStrategy->getJoinColumnName($joinColumn, $targetClass, $this->platform);
$types[] = PersisterHelper::getTypeOfColumn($joinColumn['referencedColumnName'], $class, $this->em);
} }
foreach ($mapping['joinTable']['inverseJoinColumns'] as $joinColumn) { foreach ($mapping['joinTable']['inverseJoinColumns'] as $joinColumn) {
$columns[] = $this->quoteStrategy->getJoinColumnName($joinColumn, $class, $this->platform); $columns[] = $this->quoteStrategy->getJoinColumnName($joinColumn, $targetClass, $this->platform);
$types[] = PersisterHelper::getTypeOfColumn($joinColumn['referencedColumnName'], $targetClass, $this->em);
} }
return 'INSERT INTO ' . $this->quoteStrategy->getJoinTableName($mapping, $class, $this->platform) return array(
'INSERT INTO ' . $this->quoteStrategy->getJoinTableName($mapping, $class, $this->platform)
. ' (' . implode(', ', $columns) . ')' . ' (' . implode(', ', $columns) . ')'
. ' VALUES' . ' VALUES'
. ' (' . implode(', ', array_fill(0, count($columns), '?')) . ')'; . ' (' . implode(', ', array_fill(0, count($columns), '?')) . ')',
$types,
);
} }
/** /**