From f104bd3504d5907fbfc1e833e768694456700f6e Mon Sep 17 00:00:00 2001 From: mark_story Date: Wed, 13 Feb 2013 22:43:18 -0500 Subject: [PATCH] Use simpler asserts. Refs #3622 --- .../Model/Datasource/Database/PostgresTest.php | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php b/lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php index bd2faa200..e9e91017c 100644 --- a/lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php +++ b/lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php @@ -746,12 +746,16 @@ class PostgresTest extends CakeTestCase { */ public function testAlterSchemaRenameTo() { $query = $this->Dbo->alterSchema(array( - 'posts' => array('change' => array('title' => array('name' => 'subject', 'type' => 'string', 'null' => false))) - )); - $this->assertRegExp('/RENAME "title" TO "subject";/i', $query); - $this->assertRegExp('/ALTER COLUMN "subject" TYPE /i', $query); - $this->assertNotRegExp('/;\n\tALTER COLUMN "subject" TYPE /i', $query); - $this->assertNotRegExp('/ALTER COLUMN "title" TYPE "subject"/i', $query); + 'posts' => array( + 'change' => array( + 'title' => array('name' => 'subject', 'type' => 'string', 'null' => false) + ) + ) + )); + $this->assertContains('RENAME "title" TO "subject";', $query); + $this->assertContains('ALTER COLUMN "subject" TYPE', $query); + $this->assertNotContains(";\n\tALTER COLUMN \"subject\" TYPE", $query); + $this->assertNotContains('ALTER COLUMN "title" TYPE "subject"', $query); } /** @@ -937,6 +941,7 @@ class PostgresTest extends CakeTestCase { * @return void */ public function testNestedTransaction() { + $this->Dbo->useNestedTransactions = true; $this->skipIf($this->Dbo->nestedTransactionSupported() === false, 'The Postgres server do not support nested transaction'); $this->loadFixtures('Article');