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

Merge pull request #24333 from nextcloud/backport/24315/stable20 

[stable20] avoid empty null default with value that will be inserted anyways
This commit is contained in:
Joas Schilling 2020-11-26 14:50:27 +01:00 committed by GitHub
parent 921f9441d3 4850019fcd
commit 61f1c12fb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/workflowengine/lib/Migration/PopulateNewlyIntroducedDatabaseFields.php
View File

@ -26,7 +26,6 @@ declare(strict_types=1);
namespace OCA\WorkflowEngine\Migration;
use Doctrine\DBAL\Driver\Statement;
use OCA\WorkflowEngine\Entity\File;
use OCP\IDBConnection;
use OCP\Migration\IOutput;
use OCP\Migration\IRepairStep;
@ -51,17 +50,6 @@ class PopulateNewlyIntroducedDatabaseFields implements IRepairStep {
$this->populateScopeTable($result);
$result->closeCursor();
$this->populateEntityCol();
}
protected function populateEntityCol() {
$qb = $this->dbc->getQueryBuilder();
$qb->update('flow_operations')
->set('entity', $qb->createNamedParameter(File::class))
->where($qb->expr()->emptyString('entity'))
->execute();
}
protected function populateScopeTable(Statement $ids): void {

3
apps/workflowengine/lib/Migration/Version2000Date20190808074233.php
View File

@ -7,6 +7,7 @@ namespace OCA\WorkflowEngine\Migration;
use Closure;
use Doctrine\DBAL\Schema\Table;
use Doctrine\DBAL\Types\Types;
use OCA\WorkflowEngine\Entity\File;
use OCP\DB\ISchemaWrapper;
use OCP\Migration\IOutput;
use OCP\Migration\SimpleMigrationStep;
@ -116,7 +117,7 @@ class Version2000Date20190808074233 extends SimpleMigrationStep {
$table->addColumn('entity', Types::STRING, [
'notnull' => true,
'length' => 256,
'default' => '',
'default' => File::class,
]);
}
if (!$table->hasColumn('events')) {