From b091b15f0bc683e15f5f6ee2414c265ac7a3cdbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Mon, 7 Jul 2014 12:32:24 +0200 Subject: [PATCH] MySQL: adding repair step to convert MyIsam tables to InnoDB --- lib/private/repair.php | 1 + lib/repair/innodb.php | 51 ++++++++++++++++++++++++ tests/lib/repair/repairinnodb.php | 65 +++++++++++++++++++++++++++++++ 3 files changed, 117 insertions(+) create mode 100644 lib/repair/innodb.php create mode 100644 tests/lib/repair/repairinnodb.php diff --git a/lib/private/repair.php b/lib/private/repair.php index 14a917be32..89886dd931 100644 --- a/lib/private/repair.php +++ b/lib/private/repair.php @@ -81,6 +81,7 @@ class Repair extends BasicEmitter { */ public static function getBeforeUpgradeRepairSteps() { return array( + new \OC\Repair\InnoDB() ); } diff --git a/lib/repair/innodb.php b/lib/repair/innodb.php new file mode 100644 index 0000000000..4d58bf64a9 --- /dev/null +++ b/lib/repair/innodb.php @@ -0,0 +1,51 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OC\Repair; + +use Doctrine\DBAL\Platforms\MySqlPlatform; +use OC\Hooks\BasicEmitter; + +class InnoDB extends BasicEmitter implements \OC\RepairStep { + + public function getName() { + return 'Repair MySQL database engine'; + } + + /** + * Fix mime types + */ + public function run() { + $connection = \OC_DB::getConnection(); + if (!$connection->getDatabasePlatform() instanceof MySqlPlatform) { + $this->emit('\OC\Repair', 'info', array('Not a mysql database -> nothing to no')); + return; + } + + $tables = $this->getAllMyIsamTables($connection); + foreach ($tables as $table) { + $connection->exec("ALTER TABLE $table ENGINE=InnoDB;"); + $this->emit('\OC\Repair', 'info', array("Fixed $table")); + } + } + + /** + * @param \Doctrine\DBAL\Connection $connection + * @return string[] + */ + private function getAllMyIsamTables($connection) { + $dbName = \OC::$server->getConfig()->getSystemValue("dbname"); + $result = $connection->fetchArray( + "SELECT table_name FROM information_schema.tables WHERE table_schema = ? AND engine = 'MyISAM'", + array($dbName) + ); + + return $result; + } +} + diff --git a/tests/lib/repair/repairinnodb.php b/tests/lib/repair/repairinnodb.php new file mode 100644 index 0000000000..e7d2442f12 --- /dev/null +++ b/tests/lib/repair/repairinnodb.php @@ -0,0 +1,65 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +/** + * Tests for the converting of MySQL tables to InnoDB engine + * + * @see \OC\Repair\RepairMimeTypes + */ +class TestRepairInnoDB extends PHPUnit_Framework_TestCase { + + /** @var \OC\RepairStep */ + private $repair; + + /** @var \Doctrine\DBAL\Connection */ + private $connection; + + /** @var string */ + private $tableName; + + public function setUp() { + $this->connection = \OC_DB::getConnection(); + if (!$this->connection->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\MySqlPlatform) { + $this->markTestSkipped("Test only relevant on MySql"); + } + + $dbPrefix = \OC::$server->getConfig()->getSystemValue("dbtableprefix"); + $this->tableName = uniqid($dbPrefix . "_innodb_test"); + $this->connection->exec("CREATE TABLE $this->tableName(id INT) ENGINE MyISAM"); + + $this->repair = new \OC\Repair\InnoDB(); + } + + public function tearDown() { + $this->connection->getSchemaManager()->dropTable($this->tableName); + } + + public function testInnoDBConvert() { + $result = $this->countMyIsamTables(); + $this->assertEquals(1, $result); + + $this->repair->run(); + + $result = $this->countMyIsamTables(); + $this->assertEquals(0, $result); + } + + /** + * @param $dbName + * @return mixed + */ + private function countMyIsamTables() { + $dbName = \OC::$server->getConfig()->getSystemValue("dbname"); + + $result = $this->connection->fetchColumn( + "SELECT count(*) FROM information_schema.tables WHERE table_schema = ? and table_name = ? AND engine = 'MyISAM'", + array($dbName, $this->tableName) + ); + return $result; + } +}