From 2959e15c7a23fd939a6341a70b856752efdf17a1 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 24 Sep 2019 11:01:18 +0200 Subject: [PATCH] Fix "Cannot add a NOT NULL column with default value NULL" Signed-off-by: Joas Schilling --- .../composer/composer/autoload_classmap.php | 2 +- .../composer/composer/autoload_static.php | 2 +- ...08074233.php => Version2000Date20190808074233.php} | 11 ++++++++++- 3 files changed, 12 insertions(+), 3 deletions(-) rename apps/workflowengine/lib/Migration/{Version2019Date20190808074233.php => Version2000Date20190808074233.php} (92%) diff --git a/apps/workflowengine/composer/composer/autoload_classmap.php b/apps/workflowengine/composer/composer/autoload_classmap.php index 0de2a50234..e90b6edd4e 100644 --- a/apps/workflowengine/composer/composer/autoload_classmap.php +++ b/apps/workflowengine/composer/composer/autoload_classmap.php @@ -27,7 +27,7 @@ return array( 'OCA\\WorkflowEngine\\Helper\\ScopeContext' => $baseDir . '/../lib/Helper/ScopeContext.php', 'OCA\\WorkflowEngine\\Manager' => $baseDir . '/../lib/Manager.php', 'OCA\\WorkflowEngine\\Migration\\PopulateNewlyIntroducedDatabaseFields' => $baseDir . '/../lib/Migration/PopulateNewlyIntroducedDatabaseFields.php', - 'OCA\\WorkflowEngine\\Migration\\Version2019Date20190808074233' => $baseDir . '/../lib/Migration/Version2019Date20190808074233.php', + 'OCA\\WorkflowEngine\\Migration\\Version2000Date20190808074233' => $baseDir . '/../lib/Migration/Version2000Date20190808074233.php', 'OCA\\WorkflowEngine\\Service\\RuleMatcher' => $baseDir . '/../lib/Service/RuleMatcher.php', 'OCA\\WorkflowEngine\\Settings\\ASettings' => $baseDir . '/../lib/Settings/ASettings.php', 'OCA\\WorkflowEngine\\Settings\\Admin' => $baseDir . '/../lib/Settings/Admin.php', diff --git a/apps/workflowengine/composer/composer/autoload_static.php b/apps/workflowengine/composer/composer/autoload_static.php index 0f8a488295..63f1bf74ab 100644 --- a/apps/workflowengine/composer/composer/autoload_static.php +++ b/apps/workflowengine/composer/composer/autoload_static.php @@ -42,7 +42,7 @@ class ComposerStaticInitWorkflowEngine 'OCA\\WorkflowEngine\\Helper\\ScopeContext' => __DIR__ . '/..' . '/../lib/Helper/ScopeContext.php', 'OCA\\WorkflowEngine\\Manager' => __DIR__ . '/..' . '/../lib/Manager.php', 'OCA\\WorkflowEngine\\Migration\\PopulateNewlyIntroducedDatabaseFields' => __DIR__ . '/..' . '/../lib/Migration/PopulateNewlyIntroducedDatabaseFields.php', - 'OCA\\WorkflowEngine\\Migration\\Version2019Date20190808074233' => __DIR__ . '/..' . '/../lib/Migration/Version2019Date20190808074233.php', + 'OCA\\WorkflowEngine\\Migration\\Version2000Date20190808074233' => __DIR__ . '/..' . '/../lib/Migration/Version2000Date20190808074233.php', 'OCA\\WorkflowEngine\\Service\\RuleMatcher' => __DIR__ . '/..' . '/../lib/Service/RuleMatcher.php', 'OCA\\WorkflowEngine\\Settings\\ASettings' => __DIR__ . '/..' . '/../lib/Settings/ASettings.php', 'OCA\\WorkflowEngine\\Settings\\Admin' => __DIR__ . '/..' . '/../lib/Settings/Admin.php', diff --git a/apps/workflowengine/lib/Migration/Version2019Date20190808074233.php b/apps/workflowengine/lib/Migration/Version2000Date20190808074233.php similarity index 92% rename from apps/workflowengine/lib/Migration/Version2019Date20190808074233.php rename to apps/workflowengine/lib/Migration/Version2000Date20190808074233.php index 6ac48616b1..c048ffbb5b 100644 --- a/apps/workflowengine/lib/Migration/Version2019Date20190808074233.php +++ b/apps/workflowengine/lib/Migration/Version2000Date20190808074233.php @@ -11,7 +11,7 @@ use OCP\DB\ISchemaWrapper; use OCP\Migration\SimpleMigrationStep; use OCP\Migration\IOutput; -class Version2019Date20190808074233 extends SimpleMigrationStep { +class Version2000Date20190808074233 extends SimpleMigrationStep { /** * @param IOutput $output @@ -33,10 +33,12 @@ class Version2019Date20190808074233 extends SimpleMigrationStep { $table->addColumn('class', Type::STRING, [ 'notnull' => true, 'length' => 256, + 'default' => '', ]); $table->addColumn('operator', Type::STRING, [ 'notnull' => true, 'length' => 16, + 'default' => '', ]); $table->addColumn('value', Type::TEXT, [ 'notnull' => false, @@ -44,6 +46,7 @@ class Version2019Date20190808074233 extends SimpleMigrationStep { $table->addColumn('hash', Type::STRING, [ 'notnull' => true, 'length' => 32, + 'default' => '', ]); $table->setPrimaryKey(['id']); $table->addUniqueIndex(['hash'], 'flow_unique_hash'); @@ -59,10 +62,12 @@ class Version2019Date20190808074233 extends SimpleMigrationStep { $table->addColumn('class', Type::STRING, [ 'notnull' => true, 'length' => 256, + 'default' => '', ]); $table->addColumn('name', Type::STRING, [ 'notnull' => true, 'length' => 256, + 'default' => '', ]); $table->addColumn('checks', Type::TEXT, [ 'notnull' => false, @@ -87,14 +92,17 @@ class Version2019Date20190808074233 extends SimpleMigrationStep { $table->addColumn('operation_id', Type::INTEGER, [ 'notnull' => true, 'length' => 4, + 'default' => 0, ]); $table->addColumn('type', Type::INTEGER, [ 'notnull' => true, 'length' => 4, + 'default' => 0, ]); $table->addColumn('value', Type::STRING, [ 'notnull' => false, 'length' => 64, + 'default' => '', ]); $table->setPrimaryKey(['id']); $table->addUniqueIndex(['operation_id', 'type', 'value'], 'flow_unique_scope'); @@ -108,6 +116,7 @@ class Version2019Date20190808074233 extends SimpleMigrationStep { $table->addColumn('entity', Type::STRING, [ 'notnull' => true, 'length' => 256, + 'default' => '', ]); } if(!$table->hasColumn('events')) {