Skip to content

Commit

Permalink
Merge pull request #36084 from owncloud/migrations-dav-app
Browse files Browse the repository at this point in the history
Add new migrations to dav app
  • Loading branch information
sharidas authored Sep 6, 2019
2 parents 73491f9 + 5d67c07 commit 39a6ce8
Show file tree
Hide file tree
Showing 3 changed files with 65 additions and 3 deletions.
62 changes: 62 additions & 0 deletions apps/dav/appinfo/Migrations/Version20190823065724.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
<?php
/**
* @author Sujith Haridasan <[email protected]>
*
* @copyright Copyright (c) 2019, ownCloud GmbH
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3,
* as published by the Free Software Foundation.
*
* 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, version 3,
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/

namespace OCA\dav\Migrations;

use Doctrine\DBAL\Schema\Schema;
use OCP\IDBConnection;
use OCP\Migration\ISchemaMigration;

/**
* Add NULL constraint to fileid column for properties table.
* The fileid column should not accept null values in the properties table.
*/
class Version20190823065724 implements ISchemaMigration {
/** @var IDBConnection */
private $dbConnection;

public function __construct(IDBConnection $dbConnection) {
$this->dbConnection = $dbConnection;
}

public function changeSchema(Schema $schema, array $options) {
$prefix = $options['tablePrefix'];

$table = $schema->getTable("${prefix}properties");
$column = $table->getColumn('fileid');
/**
* If the fileid column's notnull is set to false then
* make sure before altering the column, that no entry
* in the table has fileid with null. Else the migration
* would fail. The below check does the same.
*/
if ($column->getNotnull() !== true) {
$qb = $this->dbConnection->getQueryBuilder();
$qb->delete('properties')
->where($qb->expr()->isNull('fileid'));
$qb->execute();

$table->changeColumn('fileid', [
'notnull' => true,
]);
}
}
}
2 changes: 1 addition & 1 deletion apps/dav/appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<description>ownCloud WebDAV endpoint</description>
<licence>AGPL</licence>
<author>owncloud.org</author>
<version>0.4.0</version>
<version>0.5.0</version>
<default_enable/>
<use-migrations>true</use-migrations>
<types>
Expand Down
4 changes: 2 additions & 2 deletions tests/Core/Command/Apps/AppsListTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ public function testCommandInput($input, $expectedOutput) {
public function providesAppIds() {
return [
[[], '- files: 1.5'],
[['--shipped' => 'true'], '- dav: 0.4.0'],
[['--shipped' => 'true'], '- dav: 0.5.0'],
[['--shipped' => 'false'], '- comments:'],
[['search-pattern' => 'dav'], '- dav: 0.4.0']
[['search-pattern' => 'dav'], '- dav: 0.5.0']
];
}
}

0 comments on commit 39a6ce8

Please sign in to comment.