Browse Source

Adding test to disprove #3807

Jose Lorenzo Rodriguez 12 years ago
parent
commit
82fd724c6a
2 changed files with 58 additions and 2 deletions
  1. 2 2
      tests/Fixture/UserFixture.php
  2. 56 0
      tests/TestCase/ORM/QueryRegressionTest.php

+ 2 - 2
tests/Fixture/UserFixture.php

@@ -35,8 +35,8 @@ class UserFixture extends TestFixture {
 		'id' => ['type' => 'integer'],
 		'username' => ['type' => 'string', 'null' => true],
 		'password' => ['type' => 'string', 'null' => true],
-		'created' => 'datetime',
-		'updated' => 'datetime',
+		'created' => ['type' => 'timestamp', 'null' => true],
+		'updated' => ['type' => 'timestamp', 'null' => true],
 		'_constraints' => ['primary' => ['type' => 'primary', 'columns' => ['id']]]
 	);
 

+ 56 - 0
tests/TestCase/ORM/QueryRegressionTest.php

@@ -0,0 +1,56 @@
+<?php
+/**
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * For full copyright and license information, please see the LICENSE.txt
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @since         3.0.0
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+namespace Cake\Test\TestCase\ORM;
+
+use Cake\ORM\Query;
+use Cake\ORM\Table;
+use Cake\ORM\TableRegistry;
+use Cake\TestSuite\TestCase;
+
+/**
+ * Contains regression test for the Query builder
+ *
+ */
+class QueryRegressionTest extends TestCase {
+
+/**
+ * Fixture to be used
+ *
+ * @var array
+ */
+	public $fixtures = ['core.user'];
+
+/**
+ * Tear down
+ *
+ * @return void
+ */
+	public function tearDown() {
+		TableRegistry::clear();
+	}
+
+/**
+ * Test for https://github.com/cakephp/cakephp/issues/3087
+ *
+ * @return void
+ */
+	public function testSelectTimestampColumn() {
+		$table = TableRegistry::get('users');
+		$user = $table->find()->where(['id' => 1])->first();
+		$this->assertEquals(new \DateTime('2007-03-17 01:16:23'), $user->created);
+		$this->assertEquals(new \DateTime('2007-03-17 01:18:31'), $user->updated);
+	}
+
+}