From 5d19b6ded932a618052f09ea5d3301b0330500f3 Mon Sep 17 00:00:00 2001 From: Jose Lorenzo Rodriguez Date: Sat, 1 Oct 2011 15:25:17 -0430 Subject: [PATCH] Removing test ins porstgres that wasn't actually testing a thing, and making another postgres test pass --- .../Datasource/Database/PostgresTest.php | 19 ------------------- lib/Cake/Test/Case/Model/ModelWriteTest.php | 1 + 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php b/lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php index a8a300c2c4d..9a9890d5d41 100644 --- a/lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php +++ b/lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php @@ -429,25 +429,6 @@ public function testLastInsertIdMultipleInsert() { $this->assertEqual($db1->lastInsertId($table), 6); } -/** - * Tests that table lists and descriptions are scoped to the proper Postgres schema - * - * @return void - */ - public function testSchemaScoping() { - $db1 = ConnectionManager::getDataSource('test'); - $db1->cacheSources = false; - $db1->query('CREATE SCHEMA _scope_test'); - - $db2 = ConnectionManager::create( - 'test_2', - array_merge($db1->config, array('driver' => 'postgres', 'schema' => '_scope_test')) - ); - $db2->cacheSources = false; - - $db2->query('DROP SCHEMA _scope_test'); - } - /** * Tests that column types without default lengths in $columns do not have length values * applied when generating schemas. diff --git a/lib/Cake/Test/Case/Model/ModelWriteTest.php b/lib/Cake/Test/Case/Model/ModelWriteTest.php index 2c2eee3dd80..d812f25816b 100644 --- a/lib/Cake/Test/Case/Model/ModelWriteTest.php +++ b/lib/Cake/Test/Case/Model/ModelWriteTest.php @@ -2897,6 +2897,7 @@ public function testSaveAllAtomic() { public function testSaveAllHasMany() { $this->loadFixtures('Article', 'Comment'); $TestModel = new Article(); + $TestModel->order = array('Article.created' => 'ASC'); $TestModel->belongsTo = $TestModel->hasAndBelongsToMany = array(); $result = $TestModel->saveAll(array(