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

Fixed an issue with the unique validator.

Browse source
This commit is contained in:
romanb 2007-04-12 08:38:59 +00:00
parent 70caab1584
commit 18766e6579
3 changed files with 64 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

111
lib/Doctrine/Validator/Unique.php
View file

@ -1,51 +1,60 @@
<?php <?php
/* /*
* $Id$ * $Id$
* *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* and is licensed under the LGPL. For more information, see * and is licensed under the LGPL. For more information, see
* <http://www.phpdoctrine.com>. * <http://www.phpdoctrine.com>.
*/ */
/** /**
* Doctrine_Validator_Unique * Doctrine_Validator_Unique
* *
* @package Doctrine * @package Doctrine
* @category Object Relational Mapping * @category Object Relational Mapping
* @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @license http://www.opensource.org/licenses/lgpl-license.php LGPL
* @link www.phpdoctrine.com * @link www.phpdoctrine.com
* @since 1.0 * @since 1.0
* @version $Revision$ * @version $Revision$
* @author Konsta Vesterinen <kvesteri@cc.hut.fi> * @author Konsta Vesterinen <kvesteri@cc.hut.fi>
*/ */
class Doctrine_Validator_Unique class Doctrine_Validator_Unique
{ {
/** /**
* @param Doctrine_Record $record * @param Doctrine_Record $record
* @param string $key * @param string $key
* @param mixed $value * @param mixed $value
* @param string $args * @param string $args
* @return boolean * @return boolean
*/ */
public function validate(Doctrine_Record $record, $key, $value, $args) public function validate(Doctrine_Record $record, $key, $value, $args)
{ {
$table = $record->getTable(); $table = $record->getTable();
$sql = 'SELECT ' . $table->getIdentifier() . ' FROM ' . $table->getTableName() . ' WHERE ' . $key . ' = ?'; $sql = 'SELECT ' . $table->getIdentifier() . ' FROM ' . $table->getTableName() . ' WHERE ' . $key . ' = ?';
$stmt = $table->getConnection()->getDbh()->prepare($sql);
$stmt->execute(array($value)); $values = array();
$values[] = $value;
return ( ! is_array($stmt->fetch()));
} foreach ($table->getPrimaryKeys() as $pk) {
} $sql .= " AND {$pk} != ?";
$values[] = $record->$pk;
}
$stmt = $table->getConnection()->getDbh()->prepare($sql);
$stmt->execute($values);
return ( ! is_array($stmt->fetch()));
}
}

5
tests/ValidatorTestCase.php
View file

@ -338,16 +338,17 @@ class Doctrine_Validator_TestCase extends Doctrine_UnitTestCase {
$this->manager->setAttribute(Doctrine::ATTR_VLD, true); $this->manager->setAttribute(Doctrine::ATTR_VLD, true);
$r = new ValidatorTest_Person(); $r = new ValidatorTest_Person();
$r->name = 'value'; $r->identifier = '1234';
$r->save(); $r->save();
$r = $this->connection->getTable('ValidatorTest_Person')->findAll()->getFirst(); $r = $this->connection->getTable('ValidatorTest_Person')->findAll()->getFirst();
$r->name = 'value'; $r->identifier = 1234;
try { try {
$r->save(); $r->save();
} }
catch(Doctrine_Validator_Exception $e) { catch(Doctrine_Validator_Exception $e) {
$this->fail("Validator exception raised without reason!"); $this->fail("Validator exception raised without reason!");
var_dump($r->getErrorStack());
} }
$this->manager->setAttribute(Doctrine::ATTR_VLD, false); $this->manager->setAttribute(Doctrine::ATTR_VLD, false);

2
tests/classes.php
View file

@ -606,7 +606,7 @@ class NestReference extends Doctrine_Record
class ValidatorTest_Person extends Doctrine_Record { class ValidatorTest_Person extends Doctrine_Record {
public function setTableDefinition() { public function setTableDefinition() {
$this->hasColumn('name', 'string', 255, array('notblank', 'unique')); $this->hasColumn('identifier', 'integer', 4, array('notblank', 'unique'));
$this->hasColumn('is_football_player', 'boolean'); $this->hasColumn('is_football_player', 'boolean');
} }