Merge pull request #279 from CakeDC/develop

merge develop branch

Console/Command/MigrationShell.php

@@ -299,6 +299,10 @@ public function run() {
 
 		$this->out(__d('migrations', 'All migrations have completed.'));
 		$this->out('');
+
+		Configure::write('Cache.disable', false);
+		Cache::clear(false, '_cake_model_');
+
 		return true;
 	}
 
@@ -438,6 +442,8 @@ protected function _promptVersionOptions($mapping, $latestVersion) {
  * @return void
  */
 	public function generate() {
+		Configure::write('Cache.disable', true);
+
 		$fromSchema = false;
 		$this->Schema = $this->_getSchema();
 		$migration = array('up' => array(), 'down' => array());

Docs/Documentation/Migrations.md

@@ -185,21 +185,11 @@ The ```rename_field``` directive changes the name of a field on a specified tabl
 Alter Index
 -----------
 
-In order to add a new index to an existing field, you need to drop the field and create it again passing the index definition in an array.
+In order to add a new index to an existing field, you need to pass the index definition in an array.
 
 ```php
-'drop_field' => array(
-	'posts' => array(
-		'title'
-	)
-),
 'create_field' => array(
 	'posts' => array(
-		'title' => array(
-			'type' => 'string',
-			'length' => 255,
-			'null' => false
-		),
 		'indexes' => array(
 			'UNIQUE_TITLE' => array(
 				'column' => 'title',
@@ -210,25 +200,15 @@ In order to add a new index to an existing field, you need to drop the field and
 )
 ```
 
-Likewise, if you want to drop an index, then you need to drop the field including the indexes you want to drop, then create the field again.
+Likewise, if you want to drop an index.
 
 ```php
 'drop_field' => array(
 	'posts' => array(
-		'title',
 		'indexes' => array(
 			'UNIQUE_TITLE'
 		)
 	)
-),
-'create_field' => array(
-	'posts' => array(
-		'title' => array(
-			'type' => 'string',
-			'null' => true,
-			'length' => 255
-		)
-	)
 )
 ```