Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Stable10] Fix storing/retrieval for dav properties of non files #29273

Merged
merged 7 commits into from
Oct 18, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/dav/appinfo/Migrations/Version20170116150538.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* @author Victor Dubiniuk <[email protected]>
* @author Viktar Dubiniuk <[email protected]>
*
* @copyright Copyright (c) 2017, ownCloud GmbH
* @license AGPL-3.0
Expand Down
2 changes: 1 addition & 1 deletion apps/dav/appinfo/Migrations/Version20170116170538.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* @author Victor Dubiniuk <[email protected]>
* @author Viktar Dubiniuk <[email protected]>
*
* @copyright Copyright (c) 2017, ownCloud GmbH
* @license AGPL-3.0
Expand Down
2 changes: 1 addition & 1 deletion apps/dav/appinfo/Migrations/Version20170202213905.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* @author Victor Dubiniuk <[email protected]>
* @author Viktar Dubiniuk <[email protected]>
*
* @copyright Copyright (c) 2017, ownCloud GmbH
* @license AGPL-3.0
Expand Down
2 changes: 1 addition & 1 deletion apps/dav/appinfo/Migrations/Version20170202220512.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* @author Victor Dubiniuk <[email protected]>
* @author Viktar Dubiniuk <[email protected]>
*
* @copyright Copyright (c) 2017, ownCloud GmbH
* @license AGPL-3.0
Expand Down
2 changes: 1 addition & 1 deletion apps/dav/appinfo/Migrations/Version20170427182800.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* @author Victor Dubiniuk <[email protected]>
* @author Viktar Dubiniuk <[email protected]>
*
* @copyright Copyright (c) 2017, ownCloud GmbH
* @license AGPL-3.0
Expand Down
66 changes: 66 additions & 0 deletions apps/dav/appinfo/Migrations/Version20170927201245.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
<?php
/**
* @author Viktar Dubiniuk <[email protected]>
*
* @copyright Copyright (c) 2017, 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 OCP\Migration\ISchemaMigration;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\DBAL\Types\Type;

/*
* Create dav_properties table that stores properties
* of non-fs items (calendar/contacts) by path
*/

class Version20170927201245 implements ISchemaMigration {

/**
* @param Schema $schema
* @param array $options
*/
public function changeSchema(Schema $schema, array $options) {
$prefix = $options['tablePrefix'];
if (!$schema->hasTable("${prefix}dav_properties")){
$table = $schema->createTable("${prefix}dav_properties");
$table->addColumn('id', Type::BIGINT, [
'autoincrement' => true,
'notnull' => true,
'length' => 20,
]);
$table->addColumn('propertypath', Type::STRING, [
'notnull' => true,
'length' => 255,
'default' => '',
]);
$table->addColumn('propertyname', Type::STRING, [
'notnull' => true,
'length' => 255,
'default' => '',
]);
$table->addColumn('propertyvalue', Type::STRING, [
'notnull' => true,
'length' => 255,
]);
$table->setPrimaryKey(['id']);
$table->addIndex(['propertypath'], 'propertypath_index');
}
}
}
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.3.1</version>
<version>0.3.2</version>
<default_enable/>
<use-migrations>true</use-migrations>
<types>
Expand Down
Loading