Merge pull request phalcon#11240 from sergeyklay/2.0.x

Fixed issue phalcon#11239
Alive2212 · Dec 17, 2015 · 2e27777 · 2e27777
2 parents 0641ea4 + 1029fd0
commit 2e27777
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 - ORM: Added support for DATE columns in Oracle
 - Fixed wrong total_items and total_pages in Paginator when the query builder has set groupBy()
 - Fixed `Phalcon\Acl\Memory::allow` bug[#11210] related to the inconsistent behavior with access specified as string and array
+- Added quoting column in `Phalcon\Db\Dialect\MySQL::addColumn` when define position of the column
+- Added support to define position of the column in `Phalcon\Db\Dialect\MySQL::modifyColumn`
 
 # [2.0.9](https://github.com/phalcon/cphalcon/releases/tag/phalcon-v2.0.9) (2015-11-24)
 - Fixed bug that double serializes data using Redis adapter

diff --git a/phalcon/db/dialect/mysql.zep b/phalcon/db/dialect/mysql.zep
@@ -246,7 +246,7 @@ class MySQL extends Dialect
 		} else {
 			let afterPosition = column->getAfterPosition();
 			if afterPosition {
-				let sql .=  " AFTER " . afterPosition;
+				let sql .=  " AFTER `" . afterPosition . "`";
 			}
 		}
 		return sql;
@@ -257,7 +257,7 @@ class MySQL extends Dialect
 	 */
 	public function modifyColumn(string! tableName, string! schemaName, <ColumnInterface> column, <ColumnInterface> currentColumn = null) -> string
 	{
-		var sql, defaultValue;
+		var afterPosition, sql, defaultValue;
 
 		let sql = "ALTER TABLE " . this->prepareTable(tableName, schemaName) . " MODIFY `" . column->getName() . "` " . this->getColumnDefinition(column);
 
@@ -278,6 +278,14 @@ class MySQL extends Dialect
 			let sql .= " AUTO_INCREMENT";
 		}
 
+		if column->isFirst() {
+			let sql .= " FIRST";
+		} else {
+			let afterPosition = column->getAfterPosition();
+			if afterPosition {
+				let sql .=  " AFTER `" . afterPosition . "`";
+			}
+		}
 		return sql;
 	}
 

diff --git a/unit-tests/DbDialectTest.php b/unit-tests/DbDialectTest.php
@@ -93,7 +93,8 @@ private function getColumns()
 				'type' => 'ENUM',
 				'typeValues' => array('A', 'B', 'C'),
 				'notNull' => true,
-				'default' => 'A'
+				'default' => 'A',
+				'after' => 'column11'
 			)),
 			'column13' => new Column("column13", array(
 				'type' => Column::TYPE_TIMESTAMP,
@@ -435,8 +436,8 @@ public function testMysqlDialect()
 		$this->assertEquals($dialect->addColumn('table', 'schema', $columns['column10']), 'ALTER TABLE `schema`.`table` ADD `column10` INT(18) UNSIGNED DEFAULT "10"');
 		$this->assertEquals($dialect->addColumn('table', null, $columns['column11']), 'ALTER TABLE `table` ADD `column11` BIGINT(20) UNSIGNED');
 		$this->assertEquals($dialect->addColumn('table', 'schema', $columns['column11']), 'ALTER TABLE `schema`.`table` ADD `column11` BIGINT(20) UNSIGNED');
-		$this->assertEquals($dialect->addColumn('table', null, $columns['column12']), "ALTER TABLE `table` ADD `column12` ENUM(\"A\", \"B\", \"C\") DEFAULT \"A\" NOT NULL");
-		$this->assertEquals($dialect->addColumn('table', 'schema', $columns['column12']), "ALTER TABLE `schema`.`table` ADD `column12` ENUM(\"A\", \"B\", \"C\") DEFAULT \"A\" NOT NULL");
+		$this->assertEquals($dialect->addColumn('table', null, $columns['column12']), "ALTER TABLE `table` ADD `column12` ENUM(\"A\", \"B\", \"C\") DEFAULT \"A\" NOT NULL AFTER `column11`");
+		$this->assertEquals($dialect->addColumn('table', 'schema', $columns['column12']), "ALTER TABLE `schema`.`table` ADD `column12` ENUM(\"A\", \"B\", \"C\") DEFAULT \"A\" NOT NULL AFTER `column11`");
 		$this->assertEquals($dialect->addColumn('table', 'schema', $columns['column13']), "ALTER TABLE `schema`.`table` ADD `column13` TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL");
 
 		//Modify Columns
@@ -462,8 +463,8 @@ public function testMysqlDialect()
 		$this->assertEquals($dialect->modifyColumn('table', 'schema', $columns['column10']), 'ALTER TABLE `schema`.`table` MODIFY `column10` INT(18) UNSIGNED DEFAULT "10"');
 		$this->assertEquals($dialect->modifyColumn('table', null, $columns['column11']), 'ALTER TABLE `table` MODIFY `column11` BIGINT(20) UNSIGNED');
 		$this->assertEquals($dialect->modifyColumn('table', 'schema', $columns['column11']), 'ALTER TABLE `schema`.`table` MODIFY `column11` BIGINT(20) UNSIGNED');
-		$this->assertEquals($dialect->modifyColumn('table', null, $columns['column12']), "ALTER TABLE `table` MODIFY `column12` ENUM(\"A\", \"B\", \"C\") DEFAULT \"A\" NOT NULL");
-		$this->assertEquals($dialect->modifyColumn('table', 'schema', $columns['column12']), "ALTER TABLE `schema`.`table` MODIFY `column12` ENUM(\"A\", \"B\", \"C\") DEFAULT \"A\" NOT NULL");
+		$this->assertEquals($dialect->modifyColumn('table', null, $columns['column12']), "ALTER TABLE `table` MODIFY `column12` ENUM(\"A\", \"B\", \"C\") DEFAULT \"A\" NOT NULL AFTER `column11`");
+		$this->assertEquals($dialect->modifyColumn('table', 'schema', $columns['column12']), "ALTER TABLE `schema`.`table` MODIFY `column12` ENUM(\"A\", \"B\", \"C\") DEFAULT \"A\" NOT NULL AFTER `column11`");
 		$this->assertEquals($dialect->modifyColumn('table', 'schema', $columns['column13']), "ALTER TABLE `schema`.`table` MODIFY `column13` TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL");
 
 		//Drop Columns