Create rename field statements in postgres

Refs #3622
cakephp · Feb 14, 2013 · fbb1a81 · fbb1a81 · kaz29 · Apr 27, 2013
1 parent 1b22d48
commit fbb1a81
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/lib/Cake/Model/Datasource/Database/Postgres.php b/lib/Cake/Model/Datasource/Database/Postgres.php
@@ -526,6 +526,12 @@ public function alterSchema($compare, $table = null) {
 								$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
@@ -739,6 +739,21 @@ public function testAlterIndexes() {
 		$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->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);
+	}
+
 /**
  * Test it is possible to use virtual field with postgresql
  *