diff --git a/lib/Cake/Model/Datasource/Database/Postgres.php b/lib/Cake/Model/Datasource/Database/Postgres.php index 002d25f68..3065b4d40 100644 --- a/lib/Cake/Model/Datasource/Database/Postgres.php +++ b/lib/Cake/Model/Datasource/Database/Postgres.php @@ -526,6 +526,12 @@ class Postgres extends DboSource { $default = isset($col['default']) ? $col['default'] : null; $nullable = isset($col['null']) ? $col['null'] : null; unset($col['default'], $col['null']); + if ($field !== $col['name']) { + $newName = $this->name($col['name']); + $out .= "\tRENAME {$fieldName} TO {$newName};\n"; + $out .= 'ALTER TABLE ' . $this->fullTableName($curTable) . " \n"; + $fieldName = $newName; + } $colList[] = 'ALTER COLUMN ' . $fieldName . ' TYPE ' . str_replace(array($fieldName, 'NOT NULL'), '', $this->buildColumn($col)); if (isset($nullable)) { $nullable = ($nullable) ? 'DROP NOT NULL' : 'SET NOT NULL'; diff --git a/lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php b/lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php index 324b9dcc8..e9e91017c 100644 --- a/lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php +++ b/lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php @@ -739,6 +739,25 @@ class PostgresTest extends CakeTestCase { $this->Dbo->query($this->Dbo->dropSchema($schema1)); } +/** + * Test the alterSchema RENAME statements + * + * @return void + */ + public function testAlterSchemaRenameTo() { + $query = $this->Dbo->alterSchema(array( + '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); + } + /** * Test it is possible to use virtual field with postgresql * @@ -922,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');