adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Increasing Model test compatibility with SQLite and Postgres

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8188 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
mark_story 2009-06-04 00:37:27 +00:00
parent f983340d21
commit b055db19f7
2 changed files with 58 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
cake/tests/cases/libs/model/model.test.php
View file

@ -266,6 +266,7 @@ class ModelTest extends CakeTestCase {
$this->assertEqual($model->getColumnType('Tag.id'), 'integer'); $this->assertEqual($model->getColumnType('Tag.id'), 'integer');
$this->assertEqual($model->getColumnType('Article.id'), 'integer'); $this->assertEqual($model->getColumnType('Article.id'), 'integer');
} }
/** /**
* testMultipleBelongsToWithSameClass method * testMultipleBelongsToWithSameClass method
* *
@ -410,6 +411,7 @@ class ModelTest extends CakeTestCase {
); );
$this->assertTrue($Fruit->save($data)); $this->assertTrue($Fruit->save($data));
} }
/** /**
* testHabtmUuidWithNumericId method * testHabtmUuidWithNumericId method
* *
@ -1303,6 +1305,7 @@ class ModelTest extends CakeTestCase {
// $result = $NumericArticle->find($data); // $result = $NumericArticle->find($data);
// $this->assertTrue(empty($result)); // $this->assertTrue(empty($result));
} }
/** /**
* test find('all') method * test find('all') method
* *
@ -1379,7 +1382,7 @@ class ModelTest extends CakeTestCase {
$this->assertEqual($result, $expected); $this->assertEqual($result, $expected);
$ids = array(4 => 1, 5 => 3); $ids = array(4 => 1, 5 => 3);
$result = $TestModel->find('all', array('conditions' => array('User.id' => $ids))); $result = $TestModel->find('all', array('conditions' => array('User.id' => $ids), 'order' => 'User.id'));
$expected = array( $expected = array(
array('User' => array('id' => '1', 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31')), array('User' => array('id' => '1', 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31')),
array('User' => array('id' => '3', 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31')), array('User' => array('id' => '3', 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31')),
@ -1863,16 +1866,28 @@ class ModelTest extends CakeTestCase {
$this->assertTrue(isset($this->db->_queriesLog[0]['query'])); $this->assertTrue(isset($this->db->_queriesLog[0]['query']));
$this->assertNoPattern('/ORDER\s+BY/', $this->db->_queriesLog[0]['query']); $this->assertNoPattern('/ORDER\s+BY/', $this->db->_queriesLog[0]['query']);
}
$this->db->_queriesLog = array(); /**
$this->db->fullDebug = $fullDebug; * test find with COUNT(DISTINCT field)
*
* @return void
**/
function testFindCountDistinct() {
$skip = $this->skipIf(
$this->db->config['driver'] == 'sqlite',
'SELECT COUNT(DISTINCT field) is not compatible with SQLite'
);
if ($skip) {
return;
}
$this->loadFixtures('Project');
$TestModel =& new Project(); $TestModel =& new Project();
$TestModel->create(array('name' => 'project')) && $TestModel->save(); $TestModel->create(array('name' => 'project')) && $TestModel->save();
$TestModel->create(array('name' => 'project')) && $TestModel->save(); $TestModel->create(array('name' => 'project')) && $TestModel->save();
$TestModel->create(array('name' => 'project')) && $TestModel->save(); $TestModel->create(array('name' => 'project')) && $TestModel->save();
$result = $TestModel->find('count', array('fields' => 'DISTINCT Project.name')); $result = $TestModel->find('count', array('fields' => 'DISTINCT name'));
$this->assertEqual($result, 4); $this->assertEqual($result, 4);
} }
/** /**
@ -3695,6 +3710,7 @@ class ModelTest extends CakeTestCase {
); );
$this->assertEqual($result, $expected); $this->assertEqual($result, $expected);
} }
/** /**
* testSaveAllValidation method * testSaveAllValidation method
* *
@ -3712,7 +3728,7 @@ class ModelTest extends CakeTestCase {
); );
$this->assertTrue($TestModel->saveAll($data)); $this->assertTrue($TestModel->saveAll($data));
$result = $TestModel->find('all', array('recursive' => -1)); $result = $TestModel->find('all', array('recursive' => -1, 'order' => 'Post.id ASC'));
$ts = date('Y-m-d H:i:s'); $ts = date('Y-m-d H:i:s');
$expected = array( $expected = array(
array('Post' => array('id' => '1', 'author_id' => '1', 'title' => 'Baleeted First Post', 'body' => 'Baleeted!', 'published' => 'N', 'created' => '2007-03-18 10:39:23', 'updated' => $ts)), array('Post' => array('id' => '1', 'author_id' => '1', 'title' => 'Baleeted First Post', 'body' => 'Baleeted!', 'published' => 'N', 'created' => '2007-03-18 10:39:23', 'updated' => $ts)),
@ -3730,7 +3746,7 @@ class ModelTest extends CakeTestCase {
$result = $TestModel->saveAll($data); $result = $TestModel->saveAll($data);
$this->assertEqual($result, false); $this->assertEqual($result, false);
$result = $TestModel->find('all', array('recursive' => -1)); $result = $TestModel->find('all', array('recursive' => -1, 'order' => 'Post.id ASC'));
$errors = array(1 => array('title' => 'This field cannot be left blank')); $errors = array(1 => array('title' => 'This field cannot be left blank'));
$transactionWorked = Set::matches('/Post[1][title=Baleeted First Post]', $result); $transactionWorked = Set::matches('/Post[1][title=Baleeted First Post]', $result);
if (!$transactionWorked) { if (!$transactionWorked) {
@ -3747,7 +3763,7 @@ class ModelTest extends CakeTestCase {
); );
$result = $TestModel->saveAll($data, array('atomic' => false)); $result = $TestModel->saveAll($data, array('atomic' => false));
$this->assertEqual($result, array(true, false)); $this->assertEqual($result, array(true, false));
$result = $TestModel->find('all', array('recursive' => -1)); $result = $TestModel->find('all', array('recursive' => -1, 'order' => 'Post.id ASC'));
$errors = array(1 => array('title' => 'This field cannot be left blank')); $errors = array(1 => array('title' => 'This field cannot be left blank'));
$newTs = date('Y-m-d H:i:s'); $newTs = date('Y-m-d H:i:s');
$expected = array( $expected = array(
@ -3765,7 +3781,7 @@ class ModelTest extends CakeTestCase {
); );
$this->assertFalse($TestModel->saveAll($data, array('validate' => 'first'))); $this->assertFalse($TestModel->saveAll($data, array('validate' => 'first')));
$result = $TestModel->find('all', array('recursive' => -1)); $result = $TestModel->find('all', array('recursive' => -1, 'order' => 'Post.id ASC'));
$this->assertEqual($result, $expected); $this->assertEqual($result, $expected);
$this->assertEqual($TestModel->validationErrors, $errors); $this->assertEqual($TestModel->validationErrors, $errors);
@ -4007,6 +4023,7 @@ class ModelTest extends CakeTestCase {
$this->assertEqual($users[0]['User']['post_count'], 1); $this->assertEqual($users[0]['User']['post_count'], 1);
$this->assertEqual($users[1]['User']['post_count'], 2); $this->assertEqual($users[1]['User']['post_count'], 2);
} }
/** /**
* test Counter Cache With Self Joining table * test Counter Cache With Self Joining table
* *
@ -4014,8 +4031,16 @@ class ModelTest extends CakeTestCase {
* @access public * @access public
*/ */
function testCounterCacheWithSelfJoin() { function testCounterCacheWithSelfJoin() {
$skip = $this->skipIf(
($this->db->config['driver'] == 'sqlite'),
'SQLite 2.x does not support ALTER TABLE ADD COLUMN'
);
if ($skip) {
return;
}
$this->loadFixtures('CategoryThread'); $this->loadFixtures('CategoryThread');
$this->db->query('ALTER TABLE '. $this->db->fullTableName('category_threads') . " ADD column child_count INT(11) DEFAULT '0'"); $this->db->query('ALTER TABLE '. $this->db->fullTableName('category_threads') . " ADD COLUMN child_count INTEGER");
$Category =& new CategoryThread(); $Category =& new CategoryThread();
$result = $Category->updateAll(array('CategoryThread.name' => "'updated'"), array('CategoryThread.parent_id' => 5)); $result = $Category->updateAll(array('CategoryThread.name' => "'updated'"), array('CategoryThread.parent_id' => 5));
$this->assertTrue($result); $this->assertTrue($result);
@ -4931,6 +4956,7 @@ class ModelTest extends CakeTestCase {
// $TestModel->set(array('title' => 'Hello', 'published' => 1, 'body' => '')); // $TestModel->set(array('title' => 'Hello', 'published' => 1, 'body' => ''));
// $this->assertEqual($TestModel->invalidFields(), array('body' => 'This field cannot be left blank')); // $this->assertEqual($TestModel->invalidFields(), array('body' => 'This field cannot be left blank'));
// } // }
/** /**
* testFindAllWithConditionInChildQuery * testFindAllWithConditionInChildQuery
* *
@ -4944,6 +4970,7 @@ class ModelTest extends CakeTestCase {
$TestModel =& new Basket(); $TestModel =& new Basket();
$recursive = 3; $recursive = 3;
$result = $TestModel->find('all', compact('conditions', 'recursive')); $result = $TestModel->find('all', compact('conditions', 'recursive'));
$expected = array( $expected = array(
array( array(
'Basket' => array( 'Basket' => array(
@ -4974,6 +5001,7 @@ class ModelTest extends CakeTestCase {
); );
$this->assertEqual($result, $expected); $this->assertEqual($result, $expected);
} }
/** /**
* testFindAllWithConditionsHavingMixedDataTypes method * testFindAllWithConditionsHavingMixedDataTypes method
* *
@ -5009,12 +5037,14 @@ class ModelTest extends CakeTestCase {
); );
$conditions = array('id' => array('1', 2)); $conditions = array('id' => array('1', 2));
$recursive = -1; $recursive = -1;
$result = $TestModel->find('all', compact('conditions', 'recursive')); $order = 'Article.id ASC';
$result = $TestModel->find('all', compact('conditions', 'recursive', 'order'));
$this->assertEqual($result, $expected); $this->assertEqual($result, $expected);
$conditions = array('id' => array('1', 2, '3.0')); $conditions = array('id' => array('1', 2, '3.0'));
$result = $TestModel->find('all', compact('recursive', 'conditions')); $order = 'Article.id ASC';
$result = $TestModel->find('all', compact('recursive', 'conditions', 'order'));
$expected = array( $expected = array(
array( array(
'Article' => array( 'Article' => array(
@ -6307,7 +6337,8 @@ class ModelTest extends CakeTestCase {
$Product =& new Product(); $Product =& new Product();
$result = $Thread->find('all', array( $result = $Thread->find('all', array(
'group' => 'Thread.project_id' 'group' => 'Thread.project_id',
'order' => 'Thread.id ASC'
)); ));
$expected = array( $expected = array(
@ -6338,7 +6369,9 @@ class ModelTest extends CakeTestCase {
$this->assertEqual($result, $expected); $this->assertEqual($result, $expected);
$rows = $Thread->find('all', array( $rows = $Thread->find('all', array(
'group' => 'Thread.project_id', 'fields' => array('Thread.project_id', 'COUNT(*) AS total'), 'order'=> 'Thread.project_id' 'group' => 'Thread.project_id',
'fields' => array('Thread.project_id', 'COUNT(*) AS total'),
'order'=> 'Thread.project_id'
)); ));
$result = array(); $result = array();
foreach($rows as $row) { foreach($rows as $row) {
@ -6397,10 +6430,17 @@ class ModelTest extends CakeTestCase {
array('Product' => array('type' => 'Music'), array( 'price' => 4)), array('Product' => array('type' => 'Music'), array( 'price' => 4)),
array('Product' => array('type' => 'Toy'), array('price' => 3)) array('Product' => array('type' => 'Toy'), array('price' => 3))
); );
$result = $Product->find('all',array('fields'=>array('Product.type','MIN(Product.price) as price'), 'group'=> 'Product.type')); $result = $Product->find('all',array(
'fields'=>array('Product.type','MIN(Product.price) as price'),
'group'=> 'Product.type',
'order' => 'Product.type ASC'
));
$this->assertEqual($result, $expected); $this->assertEqual($result, $expected);
$result = $Product->find('all', array('fields'=>array('Product.type','MIN(Product.price) as price'), 'group'=> array('Product.type'))); $result = $Product->find('all', array(
'fields'=>array('Product.type','MIN(Product.price) as price'),
'group'=> array('Product.type'),
'order' => 'Product.type ASC'));
$this->assertEqual($result, $expected); $this->assertEqual($result, $expected);
} }
/** /**

2
cake/tests/cases/libs/model/models.php
View file

@ -2543,7 +2543,7 @@ class Basket extends CakeTestModel {
'FilmFile' => array( 'FilmFile' => array(
'className' => 'FilmFile', 'className' => 'FilmFile',
'foreignKey' => 'object_id', 'foreignKey' => 'object_id',
'conditions' => 'Basket.type = "file"', 'conditions' => "Basket.type = 'file'",
'fields' => '', 'fields' => '',
'order' => '' 'order' => ''
) )