Merge pull request #1595 from Marc-pi/develop

Add InnoDB migration tool
pi-engine · May 29, 2018 · ce33319 · ce33319
2 parents 2607fbf + e63e2ed
commit ce33319
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 4 deletions.
diff --git a/usr/module/system/src/Controller/Admin/DatabaseController.php b/usr/module/system/src/Controller/Admin/DatabaseController.php
@@ -32,6 +32,7 @@ public function checkAction()
 
         $tablesError  = [];
         $columnsError = [];
+        $innodbError = [];
 
         foreach ($results->toArray() as $result) {
             $tableName = array_shift($result);
@@ -44,10 +45,13 @@ public function checkAction()
 
 
             foreach ($res->toArray() as $params) {
-
                 if ($params['Collation'] && $params['Collation'] != 'utf8_general_ci') {
                     $tablesError[$tableName] = $params['Collation'];
                 }
+
+                if ($params['Engine'] && $params['Engine'] != 'InnoDB') {
+                    $innodbError[$tableName] = $params['Engine'];
+                }
             }
 
             $sql
@@ -66,5 +70,18 @@ public function checkAction()
 
         $this->view()->assign('columnsError', $columnsError);
         $this->view()->assign('tablesError', $tablesError);
+        $this->view()->assign('innodbError', $innodbError);
+    }
+
+    public function migrateAction()
+    {
+        $table = $this->params('table');
+
+        if($table){
+            $sql     = "ALTER TABLE $table ENGINE=InnoDB;";
+            Pi::db()->getAdapter()->query($sql, 'execute');
+        }
+
+        $this->redirect()->toRoute('', ['action' => 'check']);
     }
 }
diff --git a/usr/module/system/template/admin/database-check.phtml b/usr/module/system/template/admin/database-check.phtml
@@ -15,7 +15,7 @@
         </a>
     </div>
     <div class="row">
-        <div class="col-md-6">
+        <div class="col-md-4">
             <div class="panel panel-default">
                 <div class="panel-heading">
                     <?php echo _a('Results for tables'); ?>
@@ -25,7 +25,7 @@
                 </div>
             </div>
         </div>
-        <div class="col-md-6">
+        <div class="col-md-4">
             <div class="panel panel-default">
                 <div class="panel-heading">
                     <?php echo _a('Results for columns'); ?>
@@ -35,5 +35,19 @@
                 </div>
             </div>
         </div>
+        <div class="col-md-4">
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <?php echo _a('Results for InnoDB check'); ?>
+                </div>
+                <div class="panel-body">
+                    <ul>
+                        <?php foreach($innodbError as $tableName => $tableType) : ?>
+                            <li><?php echo $tableName ?> (<?php echo $tableType ?>) => <a href="<?php echo $this->url('', ['action' => 'migrate']); ?>?table=<?php echo $tableName ?>">InnoDB</a></li>
+                        <?php endforeach; ?>
+                    </ul>
+                </div>
+            </div>
+        </div>
     </div>
 </div>
diff --git a/usr/module/system/template/admin/database-index.phtml b/usr/module/system/template/admin/database-index.phtml
@@ -21,7 +21,7 @@
                 <div class="col-md-3 text-right">
                     <a href="<?php echo $this->url('', ['action' => 'check']); ?>" class="btn btn-primary btn-sm">
                         <i class="fa fa-cog" aria-hidden="true"></i>
-                        <?php echo _a('Check UTF8'); ?>
+                        <?php echo _a('Check UTF8 and Innodb'); ?>
                     </a>
                 </div>
             </div>