Merge pull request #4354 from vanilla/fix/renameColumn

Fix renameColumn() so it works for the first time ever
vanilla · Aug 25, 2016 · 7e0e1a8 · 7e0e1a8
2 parents 04e8c35 + df12fe9
commit 7e0e1a8
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/library/database/class.mysqlstructure.php b/library/database/class.mysqlstructure.php
@@ -153,7 +153,7 @@ public function renameColumn($OldName, $NewName, $TableName = '') {
         // Rename the column
         // The syntax for renaming a column is:
         // ALTER TABLE tablename CHANGE COLUMN oldname newname originaldefinition;
-        if (!$this->executeQuery('alter table `'.$OldPrefix.$this->_TableName.'` change column `'.$OldName.'` `'.$NewName.'` '.$this->_defineColumn($OldColumn))) {
+        if (!$this->executeQuery('alter table `'.$OldPrefix.$this->_TableName.'` change column '.$this->_defineColumn($OldColumn, $NewName))) {
             throw new Exception(sprintf(t('Failed to rename table `%1$s` to `%2$s`.'), $OldName, $NewName));
         }
 
@@ -672,8 +672,9 @@ protected function _modify($Explicit = false) {
      *
      *
      * @param stdClass $column
+     * @param string $newColumnName For rename action only.
      */
-    protected function _defineColumn($column) {
+    protected function _defineColumn($column, $newColumnName = null) {
         $column = clone $column;
 
         $typeAliases = [
@@ -719,7 +720,15 @@ protected function _defineColumn($column) {
             throw new Exception(sprintf(t('The specified data type (%1$s) is not accepted for the MySQL database.'), $column->Type));
         }
 
-        $Return = "`{$column->Name}` {$column->Type}";
+        $Return = "`{$column->Name}` ";
+
+        // The CHANGE COLUMN syntax requires this ordering.
+        // @see $this->renameColumn().
+        if (is_string($newColumnName)) {
+            $Return .= "`{$newColumnName}` ";
+        }
+
+        $Return .= "{$column->Type}";
 
         $LengthTypes = $this->types('length');
         if ($column->Length != '' && in_array($column->Type, $LengthTypes)) {