Signed-off-by: Joas Schilling <coding@schilljs.com>tags/v13.0.0beta1
@@ -758,6 +758,7 @@ return array( | |||
'OC\\Repair\\NC12\\UpdateLanguageCodes' => $baseDir . '/lib/private/Repair/NC12/UpdateLanguageCodes.php', | |||
'OC\\Repair\\NC13\\RepairInvalidPaths' => $baseDir . '/lib/private/Repair/NC13/RepairInvalidPaths.php', | |||
'OC\\Repair\\OldGroupMembershipShares' => $baseDir . '/lib/private/Repair/OldGroupMembershipShares.php', | |||
'OC\\Repair\\Owncloud\\DropAccountTermsTable' => $baseDir . '/lib/private/Repair/Owncloud/DropAccountTermsTable.php', | |||
'OC\\Repair\\Owncloud\\SaveAccountsTableData' => $baseDir . '/lib/private/Repair/Owncloud/SaveAccountsTableData.php', | |||
'OC\\Repair\\RemoveRootShares' => $baseDir . '/lib/private/Repair/RemoveRootShares.php', | |||
'OC\\Repair\\RepairInvalidShares' => $baseDir . '/lib/private/Repair/RepairInvalidShares.php', |
@@ -788,6 +788,7 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c | |||
'OC\\Repair\\NC12\\UpdateLanguageCodes' => __DIR__ . '/../../..' . '/lib/private/Repair/NC12/UpdateLanguageCodes.php', | |||
'OC\\Repair\\NC13\\RepairInvalidPaths' => __DIR__ . '/../../..' . '/lib/private/Repair/NC13/RepairInvalidPaths.php', | |||
'OC\\Repair\\OldGroupMembershipShares' => __DIR__ . '/../../..' . '/lib/private/Repair/OldGroupMembershipShares.php', | |||
'OC\\Repair\\Owncloud\\DropAccountTermsTable' => __DIR__ . '/../../..' . '/lib/private/Repair/Owncloud/DropAccountTermsTable.php', | |||
'OC\\Repair\\Owncloud\\SaveAccountsTableData' => __DIR__ . '/../../..' . '/lib/private/Repair/Owncloud/SaveAccountsTableData.php', | |||
'OC\\Repair\\RemoveRootShares' => __DIR__ . '/../../..' . '/lib/private/Repair/RemoveRootShares.php', | |||
'OC\\Repair\\RepairInvalidShares' => __DIR__ . '/../../..' . '/lib/private/Repair/RepairInvalidShares.php', |
@@ -40,6 +40,7 @@ use OC\Repair\NC11\MoveAvatars; | |||
use OC\Repair\NC12\InstallCoreBundle; | |||
use OC\Repair\NC12\UpdateLanguageCodes; | |||
use OC\Repair\OldGroupMembershipShares; | |||
use OC\Repair\Owncloud\DropAccountTermsTable; | |||
use OC\Repair\Owncloud\SaveAccountsTableData; | |||
use OC\Repair\RemoveRootShares; | |||
use OC\Repair\NC13\RepairInvalidPaths; | |||
@@ -174,6 +175,7 @@ class Repair implements IOutput{ | |||
new Collation(\OC::$server->getConfig(), \OC::$server->getLogger(), $connection, true), | |||
new SqliteAutoincrement($connection), | |||
new SaveAccountsTableData($connection, $config), | |||
new DropAccountTermsTable($connection), | |||
]; | |||
return $steps; |
@@ -0,0 +1,60 @@ | |||
<?php | |||
/** | |||
* @copyright Copyright (c) 2017 Joas Schilling <coding@schilljs.com> | |||
* | |||
* @author Joas Schilling <coding@schilljs.com> | |||
* | |||
* @license GNU AGPL version 3 or any later version | |||
* | |||
* This program is free software: you can redistribute it and/or modify | |||
* it under the terms of the GNU Affero General Public License as | |||
* published by the Free Software Foundation, either version 3 of the | |||
* License, or (at your option) any later version. | |||
* | |||
* This program is distributed in the hope that it will be useful, | |||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | |||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
* GNU Affero General Public License for more details. | |||
* | |||
* You should have received a copy of the GNU Affero General Public License | |||
* along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
* | |||
*/ | |||
namespace OC\Repair\Owncloud; | |||
use OCP\IDBConnection; | |||
use OCP\Migration\IOutput; | |||
use OCP\Migration\IRepairStep; | |||
class DropAccountTermsTable implements IRepairStep { | |||
/** @var IDBConnection */ | |||
protected $db; | |||
/** | |||
* @param IDBConnection $db | |||
*/ | |||
public function __construct(IDBConnection $db) { | |||
$this->db = $db; | |||
} | |||
/** | |||
* @return string | |||
*/ | |||
public function getName() { | |||
return 'Drop account terms table when migrating from ownCloud'; | |||
} | |||
/** | |||
* @param IOutput $output | |||
*/ | |||
public function run(IOutput $output) { | |||
if (!$this->db->tableExists('account_terms')) { | |||
return; | |||
} | |||
$this->db->dropTable('account_terms'); | |||
} | |||
} | |||
@@ -26,7 +26,7 @@ | |||
// between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel | |||
// when updating major/minor version number. | |||
$OC_Version = array(13, 0, 0, 2); | |||
$OC_Version = array(13, 0, 0, 3); | |||
// The human readable string | |||
$OC_VersionString = '13.0.0 alpha'; |