mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make sure columns with an empty default are nullable for Oracle 

Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2020-11-09 10:38:47 +01:00
parent 609c8a9cf8
commit ecbb066dec
No known key found for this signature in database
GPG Key ID: 7076EA9751AACDDA
15 changed files with 138 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/dav/appinfo/info.xml
View File

@ -5,7 +5,7 @@
<name>WebDAV</name>
<summary>WebDAV endpoint</summary>
<description>WebDAV endpoint</description>
<version>1.17.0</version>
<version>1.17.1</version>
<licence>agpl</licence>
<author>owncloud.org</author>
<namespace>DAV</namespace>

1
apps/dav/composer/composer/autoload_classmap.php
View File

@ -230,6 +230,7 @@ return array(
'OCA\\DAV\\Migration\\Version1011Date20190725113607' => $baseDir . '/../lib/Migration/Version1011Date20190725113607.php',
'OCA\\DAV\\Migration\\Version1011Date20190806104428' => $baseDir . '/../lib/Migration/Version1011Date20190806104428.php',
'OCA\\DAV\\Migration\\Version1012Date20190808122342' => $baseDir . '/../lib/Migration/Version1012Date20190808122342.php',
'OCA\\DAV\\Migration\\Version1016Date20201109085907' => $baseDir . '/../lib/Migration/Version1016Date20201109085907.php',
'OCA\\DAV\\Provisioning\\Apple\\AppleProvisioningNode' => $baseDir . '/../lib/Provisioning/Apple/AppleProvisioningNode.php',
'OCA\\DAV\\Provisioning\\Apple\\AppleProvisioningPlugin' => $baseDir . '/../lib/Provisioning/Apple/AppleProvisioningPlugin.php',
'OCA\\DAV\\RootCollection' => $baseDir . '/../lib/RootCollection.php',

1
apps/dav/composer/composer/autoload_static.php
View File

@ -245,6 +245,7 @@ class ComposerStaticInitDAV
'OCA\\DAV\\Migration\\Version1011Date20190725113607' => __DIR__ . '/..' . '/../lib/Migration/Version1011Date20190725113607.php',
'OCA\\DAV\\Migration\\Version1011Date20190806104428' => __DIR__ . '/..' . '/../lib/Migration/Version1011Date20190806104428.php',
'OCA\\DAV\\Migration\\Version1012Date20190808122342' => __DIR__ . '/..' . '/../lib/Migration/Version1012Date20190808122342.php',
'OCA\\DAV\\Migration\\Version1016Date20201109085907' => __DIR__ . '/..' . '/../lib/Migration/Version1016Date20201109085907.php',
'OCA\\DAV\\Provisioning\\Apple\\AppleProvisioningNode' => __DIR__ . '/..' . '/../lib/Provisioning/Apple/AppleProvisioningNode.php',
'OCA\\DAV\\Provisioning\\Apple\\AppleProvisioningPlugin' => __DIR__ . '/..' . '/../lib/Provisioning/Apple/AppleProvisioningPlugin.php',
'OCA\\DAV\\RootCollection' => __DIR__ . '/..' . '/../lib/RootCollection.php',

2
apps/dav/lib/Migration/Version1012Date20190808122342.php
View File

@ -69,7 +69,7 @@ class Version1012Date20190808122342 extends SimpleMigrationStep {
'length' => 11,
]);
$table->addColumn('is_recurring', Types::SMALLINT, [
'notnull' => true,
'notnull' => false,
'length' => 1,
]);
$table->addColumn('uid', Types::STRING, [

60
apps/dav/lib/Migration/Version1016Date20201109085907.php Normal file
View File

@ -0,0 +1,60 @@
<?php
declare(strict_types=1);
/**
* @copyright Copyright (c) 2020 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 OCA\DAV\Migration;
use Closure;
use OCP\DB\ISchemaWrapper;
use OCP\Migration\IOutput;
use OCP\Migration\SimpleMigrationStep;
class Version1016Date20201109085907 extends SimpleMigrationStep {
/**
* @param IOutput $output
* @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
* @param array $options
* @return null|ISchemaWrapper
*/
public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
/** @var ISchemaWrapper $schema */
$schema = $schemaClosure();
$result = $this->ensureColumnIsNullable($schema, 'calendar_reminders', 'is_recurring');
return $result ? $schema : null;
}
protected function ensureColumnIsNullable(ISchemaWrapper $schema, string $tableName, string $columnName): bool {
$table = $schema->getTable($tableName);
$column = $table->getColumn($columnName);
if ($column->getNotnull()) {
$column->setNotnull(false);
return true;
}
return false;
}
}

2
core/Migrations/Version13000Date20170718121200.php
View File

@ -814,7 +814,7 @@ class Version13000Date20170718121200 extends SimpleMigrationStep {
if (!$schema->hasTable('credentials')) {
$table = $schema->createTable('credentials');
$table->addColumn('user', 'string', [
'notnull' => true,
'notnull' => false,
'length' => 64,
]);
$table->addColumn('identifier', 'string', [

1
core/Migrations/Version14000Date20180710092004.php
View File

@ -43,6 +43,7 @@ class Version14000Date20180710092004 extends SimpleMigrationStep {
if (!$table->hasColumn('password_by_talk')) {
$table->addColumn('password_by_talk', Types::BOOLEAN, [
'default' => 0,
'notnull' => false,
]);
}

4
core/Migrations/Version15000Date20180926101451.php
View File

@ -45,8 +45,8 @@ class Version15000Date20180926101451 extends SimpleMigrationStep {
$table = $schema->getTable('authtoken');
$table->addColumn('password_invalid','boolean', [
'notnull' => true,
'default' => false,
'default' => 0,
'notnull' => false,
]);
return $schema;

2
core/Migrations/Version15000Date20181015062942.php
View File

@ -45,7 +45,7 @@ class Version15000Date20181015062942 extends SimpleMigrationStep {
$table = $schema->getTable('share');
$table->addColumn('hide_download', 'smallint', [
'notnull' => true,
'notnull' => false,
'length' => 1,
'default' => 0,
]);

2
core/Migrations/Version16000Date20190207141427.php
View File

@ -102,7 +102,7 @@ class Version16000Date20190207141427 extends SimpleMigrationStep {
'default' => '',
]);
$table->addColumn('access', Types::SMALLINT, [
'notnull' => true,
'notnull' => false,
'default' => 0,
]);

2
core/Migrations/Version16000Date20190428150708.php
View File

@ -49,7 +49,7 @@ class Version16000Date20190428150708 extends SimpleMigrationStep {
if ($schema->hasTable('collres_accesscache')) {
$table = $schema->getTable('collres_accesscache');
$table->addColumn('access', Types::BOOLEAN, [
'notnull' => true,
'notnull' => false,
'default' => false
]);
}

64
core/Migrations/Version20000Date20201109081915.php Normal file
View File

@ -0,0 +1,64 @@
<?php
declare(strict_types=1);
/**
* @copyright Copyright (c) 2020 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\Core\Migrations;
use Closure;
use OCP\DB\ISchemaWrapper;
use OCP\Migration\IOutput;
use OCP\Migration\SimpleMigrationStep;
class Version20000Date20201109081915 extends SimpleMigrationStep {
/**
* @param IOutput $output
* @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
* @param array $options
* @return null|ISchemaWrapper
*/
public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
/** @var ISchemaWrapper $schema */
$schema = $schemaClosure();
$result = $this->ensureColumnIsNullable($schema, 'share', 'password_by_talk');
$result = $this->ensureColumnIsNullable($schema, 'share', 'hide_download') || $result;
$result = $this->ensureColumnIsNullable($schema, 'credentials', 'user') || $result;
$result = $this->ensureColumnIsNullable($schema, 'authtoken', 'password_invalid') || $result;
$result = $this->ensureColumnIsNullable($schema, 'collres_accesscache', 'access') || $result;
return $result ? $schema : null;
}
protected function ensureColumnIsNullable(ISchemaWrapper $schema, string $tableName, string $columnName): bool {
$table = $schema->getTable($tableName);
$column = $table->getColumn($columnName);
if ($column->getNotnull()) {
$column->setNotnull(false);
return true;
}
return false;
}
}

1
lib/composer/composer/autoload_classmap.php
View File

@ -922,6 +922,7 @@ return array(
'OC\\Core\\Migrations\\Version18000Date20191014105105' => $baseDir . '/core/Migrations/Version18000Date20191014105105.php',
'OC\\Core\\Migrations\\Version18000Date20191204114856' => $baseDir . '/core/Migrations/Version18000Date20191204114856.php',
'OC\\Core\\Migrations\\Version19000Date20200211083441' => $baseDir . '/core/Migrations/Version19000Date20200211083441.php',
'OC\\Core\\Migrations\\Version20000Date20201109081915' => $baseDir . '/core/Migrations/Version20000Date20201109081915.php',
'OC\\Core\\Notification\\RemoveLinkSharesNotifier' => $baseDir . '/core/Notification/RemoveLinkSharesNotifier.php',
'OC\\Core\\Service\\LoginFlowV2Service' => $baseDir . '/core/Service/LoginFlowV2Service.php',
'OC\\DB\\Adapter' => $baseDir . '/lib/private/DB/Adapter.php',

1
lib/composer/composer/autoload_static.php
View File

@ -951,6 +951,7 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
'OC\\Core\\Migrations\\Version18000Date20191014105105' => __DIR__ . '/../../..' . '/core/Migrations/Version18000Date20191014105105.php',
'OC\\Core\\Migrations\\Version18000Date20191204114856' => __DIR__ . '/../../..' . '/core/Migrations/Version18000Date20191204114856.php',
'OC\\Core\\Migrations\\Version19000Date20200211083441' => __DIR__ . '/../../..' . '/core/Migrations/Version19000Date20200211083441.php',
'OC\\Core\\Migrations\\Version20000Date20201109081915' => __DIR__ . '/../../..' . '/core/Migrations/Version20000Date20201109081915.php',
'OC\\Core\\Notification\\RemoveLinkSharesNotifier' => __DIR__ . '/../../..' . '/core/Notification/RemoveLinkSharesNotifier.php',
'OC\\Core\\Service\\LoginFlowV2Service' => __DIR__ . '/../../..' . '/core/Service/LoginFlowV2Service.php',
'OC\\DB\\Adapter' => __DIR__ . '/../../..' . '/lib/private/DB/Adapter.php',

2
version.php
View File

@ -29,7 +29,7 @@
// between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
// when updating major/minor version number.
$OC_Version = [21, 0, 0, 2];
$OC_Version = [21, 0, 0, 3];
// The human readable string
$OC_VersionString = '21.0.0 alpha';