tmukherjee13 / yii2-reverse-migration

console/controllers/MigrationController.php

Spacing +17 added lines, -17 removed lines

@@ -102,7 +102,7 @@ 
      */
     public function actionUpData($limit = 0)
     {
-        $this->migrationPath .= DIRECTORY_SEPARATOR . $this->dataMigrationFolder;
+        $this->migrationPath .= DIRECTORY_SEPARATOR.$this->dataMigrationFolder;
         return parent::actionUp($limit);
     }
     
@@ -118,11 +118,11 @@ 
      */
     public function actionData(array $tables)
     {
-        if ($this->confirm('Create the migration ' . "?", TRUE)) {
+        if ($this->confirm('Create the migration '."?", TRUE)) {
             foreach ($tables as $key => $args) {
                 
                 $table = $args;
-                $this->class = 'insert_data_into_' . $table;
+                $this->class = 'insert_data_into_'.$table;
                 $this->table = $table;
                 $this->templateFile = '@tmukherjee13/migration/views/dataTemplate.php';
                 
@@ -150,7 +150,7 @@ 
                     
                     $pcolumns = '';
                     foreach ($columns->columns as $column) {
-                        $pcolumns .= "'" . $column->name . "',";
+                        $pcolumns .= "'".$column->name."',";
                     }
                     foreach ($data as $row) {
                         array_push($prepared_data, $row);
@@ -163,7 +163,7 @@ 
                         $prows = $this->prepareData($prepared_data);
                         
                         if ($this->useDataMigrationFolder) {
-                            $path = $this->migrationPath . DIRECTORY_SEPARATOR . $this->dataMigrationFolder;
+                            $path = $this->migrationPath.DIRECTORY_SEPARATOR.$this->dataMigrationFolder;
                             FileHelper::createDirectory($path);
                             $this->migrationPath = $path;
                         }
@@ -181,7 +181,7 @@ 
      */
     public function getFileName()
     {
-        return 'm' . gmdate('ymd_His') . '_' . $this->class;
+        return 'm'.gmdate('ymd_His').'_'.$this->class;
     }
     
     /**
@@ -200,7 +200,7 @@ 
      */
     public function prepareFile($data)
     {
-        $file = $this->migrationPath . DIRECTORY_SEPARATOR . $this->getFileName() . '.php';
+        $file = $this->migrationPath.DIRECTORY_SEPARATOR.$this->getFileName().'.php';
         try {
             
             $data['table'] = $this->table;
@@ -226,7 +226,7 @@ 
     {
         
         $schema = $args;
-        $this->class = 'dump_database_' . $schema;
+        $this->class = 'dump_database_'.$schema;
         $tables = $this->db->schema->getTableSchemas($schema);
         $addForeignKeys = '';
         $dropForeignKeys = '';
@@ -238,7 +238,7 @@ 
         $generateTables = [];
         
         foreach ($tables as $table) {
-            if ($table->name === $this->db->tablePrefix . $this->migrationTable) {
+            if ($table->name === $this->db->tablePrefix.$this->migrationTable) {
                 continue;
             }
             $generateTables[] = $table->name;
@@ -260,13 +260,13 @@ 
     public function actionTable(array $tables)
     {
         
-        if (!$this->confirm('Create the migration ' . "?")) {
+        if (!$this->confirm('Create the migration '."?")) {
             return;
         }
         
         foreach ($tables as $key => $tableName) {
             
-            $this->class = 'create_table_' . $tableName;
+            $this->class = 'create_table_'.$tableName;
             
             try {
                 
@@ -292,7 +292,7 @@ 
             $this->table = $this->getTableName($table);
             
             foreach ($table->columns as $col) {
-                $up .= "\t\t\t" . '\'' . $col->name . '\'=>"' . $this->getColType($col) . '",' . "\n";
+                $up .= "\t\t\t".'\''.$col->name.'\'=>"'.$this->getColType($col).'",'."\n";
                 if ($col->isPrimaryKey) {
                     // Add column to composite primary key array
                     $compositePrimaryKeyCols[] = $col->name;
@@ -309,15 +309,15 @@ 
                     }
                 }
                 $indexStr = implode(',', $indexArr);
-                $up .= "\t\t" . '$this->createIndex(\'idx_' . $indexKey . "', '" . $this->getTableName($table) . "', '$indexStr', TRUE);\n";
+                $up .= "\t\t".'$this->createIndex(\'idx_'.$indexKey."', '".$this->getTableName($table)."', '$indexStr', TRUE);\n";
                 
             }
             
             if (!empty($table->foreignKeys)):
                 
                 foreach ($table->foreignKeys as $fkName => $fk) {
-                    $addForeignKeys .= "\t\t" . '$this->addForeignKey("' . $fkName . '", "' . $table->name . '", "' . $fk['column'] . '","' . $fk['table'] . '","' . $fk['ref_column'] . '", "' . $fk['delete'] . '", "' . $fk['update'] . '");' . "\n";
-                    $dropForeignKeys .= '$this->dropForeignKey(' . "'$fkName', '$table->name');";
+                    $addForeignKeys .= "\t\t".'$this->addForeignKey("'.$fkName.'", "'.$table->name.'", "'.$fk['column'].'","'.$fk['table'].'","'.$fk['ref_column'].'", "'.$fk['delete'].'", "'.$fk['update'].'");'."\n";
+                    $dropForeignKeys .= '$this->dropForeignKey('."'$fkName', '$table->name');";
                 }
             
             endif;
@@ -332,7 +332,7 @@ 
                 'foreignKeys' => $table->foreignKeys,
                 'fields'      => $fields,
                 'indexes'     => $this->findIndexes($table),
-            ]) . "\n\n";
+            ])."\n\n";
             
         }
     }
@@ -417,7 +417,7 @@ 
      */
     protected function getCreateTableSql(TableSchema $table)
     {
-        $row = $this->db->createCommand('SHOW CREATE TABLE ' . $this->quoteTableName($table->fullName))->queryOne();
+        $row = $this->db->createCommand('SHOW CREATE TABLE '.$this->quoteTableName($table->fullName))->queryOne();
         if (isset($row['Create Table'])) {
             $sql = $row['Create Table'];
         } else {

Braces +23 added lines, -40 removed lines

@@ -12,8 +12,7 @@ 
 use yii\console\controllers\MigrateController;
 
 
-class MigrationController extends MigrateController
-{
+class MigrationController extends MigrateController {
     use \tmukherjee13\migration\console\components\Formatter;
     
     /**
@@ -54,16 +53,14 @@ 
     /**
      * @inheritdoc
      */
-    public function options($actionID)
-    {
+    public function options($actionID) {
         return array_merge(parent::options($actionID), ['migrationTable', 'db']);
     }
     
     /**
      * @inheritdoc
      */
-    public function beforeAction($action)
-    {
+    public function beforeAction($action) {
         
         if (parent::beforeAction($action)) {
             if (is_string($this->db)) {
@@ -100,8 +97,7 @@ 
      *
      * @return int
      */
-    public function actionUpData($limit = 0)
-    {
+    public function actionUpData($limit = 0) {
         $this->migrationPath .= DIRECTORY_SEPARATOR . $this->dataMigrationFolder;
         return parent::actionUp($limit);
     }
@@ -116,8 +112,7 @@ 
      * @throws \yii\console\Exception
      * @throws \yii\db\Exception
      */
-    public function actionData(array $tables)
-    {
+    public function actionData(array $tables) {
         if ($this->confirm('Create the migration ' . "?", TRUE)) {
             foreach ($tables as $key => $args) {
                 
@@ -158,7 +153,8 @@ 
                     
                     if (empty($prepared_data)) {
                         $this->stdout("\nTable '{$table->name}' doesn't contain any data.\n\n", Console::FG_RED);
-                    } else {
+                    }
+                    else {
                         $pcolumns = $this->prepareColumns($pcolumns);
                         $prows = $this->prepareData($prepared_data);
                         
@@ -179,16 +175,14 @@ 
     /**
      * @return string
      */
-    public function getFileName()
-    {
+    public function getFileName() {
         return 'm' . gmdate('ymd_His') . '_' . $this->class;
     }
     
     /**
      *
      */
-    public function setFileName()
-    {
+    public function setFileName() {
         $this->fileName = $this->getFileName();
     }
     
@@ -198,8 +192,7 @@ 
      * @return string
      * @throws \yii\console\Exception
      */
-    public function prepareFile($data)
-    {
+    public function prepareFile($data) {
         $file = $this->migrationPath . DIRECTORY_SEPARATOR . $this->getFileName() . '.php';
         try {
             
@@ -222,8 +215,7 @@ 
      * @return int
      * @throws \yii\console\Exception
      */
-    public function actionSchema($args)
-    {
+    public function actionSchema($args) {
         
         $schema = $args;
         $this->class = 'dump_database_' . $schema;
@@ -257,8 +249,7 @@ 
      * @return mixed
      * @author Tarun Mukherjee (https://github.com/tmukherjee13)
      */
-    public function actionTable(array $tables)
-    {
+    public function actionTable(array $tables) {
         
         if (!$this->confirm('Create the migration ' . "?")) {
             return;
@@ -343,8 +334,7 @@ 
      * @return array
      * @throws \yii\db\Exception
      */
-    protected function findConstraints($table)
-    {
+    protected function findConstraints($table) {
         $sql = <<<SQL
             SELECT
                 kcu.constraint_name,
@@ -415,12 +405,12 @@ 
      * @return mixed
      * @throws \yii\db\Exception
      */
-    protected function getCreateTableSql(TableSchema $table)
-    {
+    protected function getCreateTableSql(TableSchema $table) {
         $row = $this->db->createCommand('SHOW CREATE TABLE ' . $this->quoteTableName($table->fullName))->queryOne();
         if (isset($row['Create Table'])) {
             $sql = $row['Create Table'];
-        } else {
+        }
+        else {
             $row = array_values($row);
             $sql = $row[1];
         }
@@ -432,16 +422,14 @@ 
      *
      * @return string
      */
-    public function quoteTableName($name)
-    {
+    public function quoteTableName($name) {
         return strpos($name, '`') !== FALSE ? $name : "`$name`";
     }
     
     /**
      * @inheritdoc
      */
-    protected function parseFields()
-    {
+    protected function parseFields() {
         $fields = [];
         
         foreach ($this->fields as $column => $schema) {
@@ -480,8 +468,7 @@ 
      *
      * @return array|void
      */
-    protected function findIndexes(TableSchema $table)
-    {
+    protected function findIndexes(TableSchema $table) {
         $sql = "SHOW INDEX FROM `{$table->name}`";
         
         try {
@@ -506,8 +493,7 @@ 
      *
      * @return array
      */
-    public function filterKeyIndex($table, array $rows = [])
-    {
+    public function filterKeyIndex($table, array $rows = []) {
         $return = [];
         foreach ($rows as $row) {
             
@@ -542,8 +528,7 @@ 
     /**
      * @inheritdoc
      */
-    protected function getMigrationHistory($limit)
-    {
+    protected function getMigrationHistory($limit) {
         if ($this->db->schema->getTableSchema($this->migrationTable, TRUE) === NULL) {
             $this->createMigrationHistoryTable();
         }
@@ -563,8 +548,7 @@ 
     /**
      * @inheritdoc
      */
-    protected function addMigrationHistory($version)
-    {
+    protected function addMigrationHistory($version) {
         $command = $this->db->createCommand();
         $command->insert($this->migrationTable, [
             'version'    => $version,
@@ -575,8 +559,7 @@ 
     /**
      * @inheritdoc
      */
-    protected function removeMigrationHistory($version)
-    {
+    protected function removeMigrationHistory($version) {
         $command = $this->db->createCommand();
         $command->delete($this->migrationTable, [
             'version' => $version,

console/components/Formatter.php

Spacing +6 added lines, -6 removed lines

@@ -45,7 +45,7 @@ 
      */
     public function getTableName($table)
     {
-        return '{{%' . str_replace($this->db->tablePrefix, '', $table->name) . '}}';
+        return '{{%'.str_replace($this->db->tablePrefix, '', $table->name).'}}';
     }
     
     /**
@@ -56,7 +56,7 @@ 
      */
     public function prepareInsert($rows, $columns)
     {
-        return '$this->batchInsert("{{%test}}", ' . $rows . ', ' . $columns . ');';
+        return '$this->batchInsert("{{%test}}", '.$rows.', '.$columns.');';
     }
     
     /**
@@ -84,7 +84,7 @@ 
             $data = rtrim($data, $trim);
         }
         
-        return self::$columnEncloser[0] . rtrim($data, $trim) . self::$columnEncloser[1];
+        return self::$columnEncloser[0].rtrim($data, $trim).self::$columnEncloser[1];
     }
     
     /**
@@ -100,9 +100,9 @@ 
         foreach ($data as $row) {
             $rows = '';
             foreach ($row as $value) {
-                $rows .= "'" . addslashes($value) . "',";
+                $rows .= "'".addslashes($value)."',";
             }
-            self::$rows .= "\n\t\t\t" . self::dataFormat($rows) . ",";
+            self::$rows .= "\n\t\t\t".self::dataFormat($rows).",";
         }
         if (!empty(self::$rows)) {
             return self::dataFormat(self::$rows);
@@ -122,7 +122,7 @@ 
         if (NULL !== $trim) {
             $data = rtrim($data, $trim);
         }
-        return self::$dataEncloser[0] . $data . self::$dataEncloser[1];
+        return self::$dataEncloser[0].$data.self::$dataEncloser[1];
     }
     
     /**

Braces +27 added lines, -27 removed lines

@@ -7,8 +7,7 @@ 
 /**
  * Table class
  */
-trait Formatter
-{
+trait Formatter {
     /**
      * @var array column enclosing literal
      */
@@ -43,8 +42,7 @@ 
      * @return string
      * @author Tarun Mukherjee (https://github.com/tmukherjee13)
      */
-    public function getTableName($table)
-    {
+    public function getTableName($table) {
         return '{{%' . str_replace($this->db->tablePrefix, '', $table->name) . '}}';
     }
     
@@ -54,8 +52,7 @@ 
      *
      * @return string
      */
-    public function prepareInsert($rows, $columns)
-    {
+    public function prepareInsert($rows, $columns) {
         return '$this->batchInsert("{{%test}}", ' . $rows . ', ' . $columns . ');';
     }
     
@@ -66,8 +63,7 @@ 
      *
      * @return string
      */
-    public function prepareColumns($data, $trim = ',')
-    {
+    public function prepareColumns($data, $trim = ',') {
         return self::columnFormat($data, $trim);
     }
     
@@ -78,8 +74,7 @@ 
      *
      * @return string
      */
-    public function columnFormat($data, $trim = ',')
-    {
+    public function columnFormat($data, $trim = ',') {
         if (NULL !== $trim) {
             $data = rtrim($data, $trim);
         }
@@ -94,8 +89,7 @@ 
      *
      * @return string
      */
-    public function prepareData($data = [])
-    {
+    public function prepareData($data = []) {
         self::$rows = '';
         foreach ($data as $row) {
             $rows = '';
@@ -117,8 +111,7 @@ 
      *
      * @return string
      */
-    public function dataFormat($data, $trim = ',')
-    {
+    public function dataFormat($data, $trim = ',') {
         if (NULL !== $trim) {
             $data = rtrim($data, $trim);
         }
@@ -135,8 +128,7 @@ 
      * @author Tarun Mukherjee (https://github.com/tmukherjee13)
      */
     
-    public function formatCol($col)
-    {
+    public function formatCol($col) {
         if (!empty($col->enumValues)) {
             return $this->getColType($col);
         }
@@ -144,14 +136,18 @@ 
         $decorator = [];
         if ($col->isPrimaryKey && $col->autoIncrement) {
             $decorator[] = 'primaryKey';
-        } elseif (in_array($col->type, self::$colTypes)) {
+        }
+        elseif (in_array($col->type, self::$colTypes)) {
             $decorator[] = "{$this->modifyColType($col->dbType)}";
-        } elseif ($col->type == 'decimal') {
+        }
+        elseif ($col->type == 'decimal') {
             $decorator[] = "{$col->dbType}";
-        } else {
+        }
+        else {
             if (!empty($col->size) && $col->size == 1 && $col->type != 'char') {
                 $column = "boolean";
-            } else {
+            }
+            else {
                 $column = "{$col->type}";
                 if (!empty($col->size)) {
                     $column .= "({$col->size})";
@@ -171,9 +167,11 @@ 
         // default value.
         if (is_a($col->defaultValue, Expression::class)) {
             $decorator[] = "defaultExpression('{$col->defaultValue}')";
-        } elseif (is_numeric($col->defaultValue)) {
+        }
+        elseif (is_numeric($col->defaultValue)) {
             $decorator[] = "defaultValue({$col->defaultValue})";
-        } elseif (!empty($col->defaultValue)) {
+        }
+        elseif (!empty($col->defaultValue)) {
             $decorator[] = "defaultValue('{$col->defaultValue}')";
         }
         
@@ -193,8 +191,7 @@ 
      * @return string
      * @author Tarun Mukherjee (https://github.com/tmukherjee13)
      */
-    public function getColType($col)
-    {
+    public function getColType($col) {
         if ($col->isPrimaryKey && $col->autoIncrement) {
             return 'pk';
         }
@@ -205,11 +202,14 @@ 
         }
         if ($col->defaultValue != NULL && 'timestamp' != $col->dbType) {
             $result .= " DEFAULT '{$col->defaultValue}'";
-        } elseif ($col->defaultValue == 'CURRENT_TIMESTAMP' && 'timestamp' == $col->dbType) {
+        }
+        elseif ($col->defaultValue == 'CURRENT_TIMESTAMP' && 'timestamp' == $col->dbType) {
             $result .= " DEFAULT {$col->defaultValue}";
-        } elseif ($col->defaultValue != NULL && 'timestamp' == $col->dbType) {
+        }
+        elseif ($col->defaultValue != NULL && 'timestamp' == $col->dbType) {
             $result .= " DEFAULT '{$col->defaultValue}'";
-        } elseif ($col->allowNull) {
+        }
+        elseif ($col->allowNull) {
             $result .= ' DEFAULT NULL';
         }
         return $result;

views/_dropIndexes.php

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 /* @var $table string the name table */
 /* @var $indexes array the foreign keys */
 
-if($indexes){
+if ($indexes) {
         foreach ($indexes as $key => $index): ?>
                 $this->dropIndex('<?= $key ?>', $this->tableName);
         <?php endforeach;

Braces +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 /* @var $table string the name table */
 /* @var $indexes array the foreign keys */
 
-if($indexes){
+if($indexes) {
         foreach ($indexes as $key => $index): ?>
                 $this->dropIndex('<?= $key ?>', $this->tableName);
         <?php endforeach;

views/_addIndexes.php

Spacing +4 added lines, -4 removed lines

@@ -8,16 +8,16 @@
 
 //dd( $indexes );
 
-if($indexes){
+if ($indexes) {
         foreach ($indexes as $index):
-        if(is_string($index['Column_name'])): ?>
-        <?php if($index['Non_unique'] == 0): ?>
+        if (is_string($index['Column_name'])): ?>
+        <?php if ($index['Non_unique'] == 0): ?>
                 $this->createIndex('<?= str_replace('_UNIQUE', '', $index['Key_name'])?>', $this->tableName, '<?= $index['Column_name'] ?>', true);
         <?php else: ?>
                 $this->createIndex('<?= $index['Key_name']  ?>', $this->tableName, '<?= $index['Column_name'] ?>');
         <?php endif; ?>
         <?php else: ?>
-                $this->createIndex('<?= $index['Key_name']  ?>', $this->tableName, ['<?= implode("','",$index['Column_name']) ?>']);
+                $this->createIndex('<?= $index['Key_name']  ?>', $this->tableName, ['<?= implode("','", $index['Column_name']) ?>']);
         <?php endif; ?>
         <?php endforeach;
 }

Braces +11 added lines, -5 removed lines

@@ -8,16 +8,22 @@
 
 //dd( $indexes );
 
-if($indexes){
+if($indexes) {
         foreach ($indexes as $index):
         if(is_string($index['Column_name'])): ?>
         <?php if($index['Non_unique'] == 0): ?>
                 $this->createIndex('<?= str_replace('_UNIQUE', '', $index['Key_name'])?>', $this->tableName, '<?= $index['Column_name'] ?>', true);
-        <?php else: ?>
+        <?php else {
+    : ?>
                 $this->createIndex('<?= $index['Key_name']  ?>', $this->tableName, '<?= $index['Column_name'] ?>');
-        <?php endif; ?>
-        <?php else: ?>
+        <?php endif;
+}
+?>
+        <?php else {
+    : ?>
                 $this->createIndex('<?= $index['Key_name']  ?>', $this->tableName, ['<?= implode("','",$index['Column_name']) ?>']);
-        <?php endif; ?>
+        <?php endif;
+}
+?>
         <?php endforeach;
 }

views/_createTable.php

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
     <?php foreach ($fields as $field):
     if (!empty($field['decorators'])): ?>
         <?= "'{$field['property']}' => \$this->{$field['decorators']}" ?>,
-    <?php elseif(!empty('raw')): ?>
+    <?php elseif (!empty('raw')): ?>
         <?=$field['raw'] ?>,
     <?php else: ?>
         '<?= $field['property'] ?>',
@@ -24,7 +24,7 @@ 
 <?= $this->render('_addForeignKeys', [
     'table'       => $table,
     'foreignKeys' => $foreignKeys,
-]);?>
+]); ?>
 
 <?= $this->render('_addIndexes', [
     'table'   => $table,

Braces +3 added lines, -1 removed lines

@@ -15,9 +15,11 @@
         <?= "'{$field['property']}' => \$this->{$field['decorators']}" ?>,
     <?php elseif(!empty('raw')): ?>
         <?=$field['raw'] ?>,
-    <?php else: ?>
+    <?php else {
+    : ?>
         '<?= $field['property'] ?>',
     <?php endif;
+}
 endforeach; ?>
     ], $collation);