Fixed default definition in date* fields
This commit is contained in:
parent
8ed0530fbf
commit
806e9c63e6
@ -158,6 +158,9 @@ class Doctrine_Formatter extends Doctrine_Connection_Module
|
|||||||
case 'array':
|
case 'array':
|
||||||
case 'object':
|
case 'object':
|
||||||
$input = serialize($input);
|
$input = serialize($input);
|
||||||
|
case 'date':
|
||||||
|
case 'time':
|
||||||
|
case 'timestamp':
|
||||||
case 'string':
|
case 'string':
|
||||||
case 'char':
|
case 'char':
|
||||||
case 'varchar':
|
case 'varchar':
|
||||||
|
65
tests/Ticket/642TestCase.php
Normal file
65
tests/Ticket/642TestCase.php
Normal file
@ -0,0 +1,65 @@
|
|||||||
|
<?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.com>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Doctrine_Ticket_642_TestCase
|
||||||
|
*
|
||||||
|
* @package Doctrine
|
||||||
|
* @author Guilherme Blanco <guilhermeblanco@hotmail.com>
|
||||||
|
* @license http://www.opensource.org/licenses/lgpl-license.php LGPL
|
||||||
|
* @category Object Relational Mapping
|
||||||
|
* @link www.phpdoctrine.com
|
||||||
|
* @since 1.0
|
||||||
|
* @version $Revision$
|
||||||
|
*/
|
||||||
|
class Doctrine_Ticket_642_TestCase extends Doctrine_UnitTestCase
|
||||||
|
{
|
||||||
|
public function testInit()
|
||||||
|
{
|
||||||
|
$this->dbh = new Doctrine_Adapter_Mock('mysql');
|
||||||
|
$this->conn = Doctrine_Manager::getInstance()->openConnection($this->dbh);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public function testTest()
|
||||||
|
{
|
||||||
|
$this->conn->export->exportClasses(array('stDummyObj'));
|
||||||
|
$queries = $this->dbh->getAll();
|
||||||
|
|
||||||
|
// Default was not being defined, even if notnull was set
|
||||||
|
$this->assertEqual("CREATE TABLE st_dummy_obj (id BIGINT AUTO_INCREMENT, startdate DATETIME DEFAULT '0000-00-00 00:00:00' NOT NULL, PRIMARY KEY(id)) ENGINE = INNODB", $queries[1]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
class stDummyObj extends Doctrine_Record
|
||||||
|
{
|
||||||
|
public function setTableDefinition()
|
||||||
|
{
|
||||||
|
$this->setTableName('st_dummy_obj');
|
||||||
|
$this->hasColumn('startDate', 'timestamp', null, array(
|
||||||
|
'notnull' => true,
|
||||||
|
'default' => '0000-00-00 00:00:00'
|
||||||
|
));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
?>
|
@ -18,6 +18,7 @@ $tickets->addTestCase(new Doctrine_Ticket_587_TestCase());
|
|||||||
$tickets->addTestCase(new Doctrine_Ticket_576_TestCase());
|
$tickets->addTestCase(new Doctrine_Ticket_576_TestCase());
|
||||||
$tickets->addTestCase(new Doctrine_Ticket_583_TestCase());
|
$tickets->addTestCase(new Doctrine_Ticket_583_TestCase());
|
||||||
$tickets->addTestCase(new Doctrine_Ticket_626B_TestCase());
|
$tickets->addTestCase(new Doctrine_Ticket_626B_TestCase());
|
||||||
|
$tickets->addTestCase(new Doctrine_Ticket_642_TestCase());
|
||||||
//If you write a ticket testcase add it here like shown above!
|
//If you write a ticket testcase add it here like shown above!
|
||||||
$test->addTestCase($tickets);
|
$test->addTestCase($tickets);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user