aboutsummaryrefslogtreecommitdiffstats
path: root/apps/workflowengine/lib/Controller/AWorkflowController.php
diff options
context:
space:
mode:
authorVincent Petry <vincent@nextcloud.com>2021-08-05 10:42:38 +0200
committerVincent Petry <vincent@nextcloud.com>2021-08-10 11:19:15 +0200
commit15a62c52374ec49025ccccca48c7c4f86ffd1f74 (patch)
treeb7ef01488d3f6759df29ae8bf65594aeccb3bbca /apps/workflowengine/lib/Controller/AWorkflowController.php
parent7f69a60ab10da4ea521a5ef1802229a4d4fa2d2a (diff)
downloadnextcloud-server-15a62c52374ec49025ccccca48c7c4f86ffd1f74.tar.gz
nextcloud-server-15a62c52374ec49025ccccca48c7c4f86ffd1f74.zip
Make "name" column nullable in workflow operations
The "name" column is now unused and the code is always inserting an empty string. While this works with most databases, Oracle complains because an empty string is equivalent to null. To fix this, the column definition is changed to allow null values now. Also added some logging in case of database exceptions, because without this nothing would be logged to detect the above problem. Signed-off-by: Vincent Petry <vincent@nextcloud.com>
Diffstat (limited to 'apps/workflowengine/lib/Controller/AWorkflowController.php')
-rw-r--r--apps/workflowengine/lib/Controller/AWorkflowController.php11
1 files changed, 10 insertions, 1 deletions
diff --git a/apps/workflowengine/lib/Controller/AWorkflowController.php b/apps/workflowengine/lib/Controller/AWorkflowController.php
index 39549d3d6e0..77e50526092 100644
--- a/apps/workflowengine/lib/Controller/AWorkflowController.php
+++ b/apps/workflowengine/lib/Controller/AWorkflowController.php
@@ -36,20 +36,26 @@ use OCP\AppFramework\OCS\OCSException;
use OCP\AppFramework\OCS\OCSForbiddenException;
use OCP\AppFramework\OCSController;
use OCP\IRequest;
+use Psr\Log\LoggerInterface;
abstract class AWorkflowController extends OCSController {
/** @var Manager */
protected $manager;
+ /** @var LoggerInterface */
+ private $logger;
+
public function __construct(
$appName,
IRequest $request,
- Manager $manager
+ Manager $manager,
+ LoggerInterface $logger
) {
parent::__construct($appName, $request);
$this->manager = $manager;
+ $this->logger = $logger;
}
/**
@@ -115,6 +121,7 @@ abstract class AWorkflowController extends OCSController {
} catch (\DomainException $e) {
throw new OCSForbiddenException($e->getMessage(), $e);
} catch (Exception $e) {
+ $this->logger->error('Error when inserting flow', ['exception' => $e]);
throw new OCSException('An internal error occurred', $e->getCode(), $e);
}
}
@@ -142,6 +149,7 @@ abstract class AWorkflowController extends OCSController {
} catch (\DomainException $e) {
throw new OCSForbiddenException($e->getMessage(), $e);
} catch (Exception $e) {
+ $this->logger->error('Error when updating flow with id ' . $id, ['exception' => $e]);
throw new OCSException('An internal error occurred', $e->getCode(), $e);
}
}
@@ -160,6 +168,7 @@ abstract class AWorkflowController extends OCSController {
} catch (\DomainException $e) {
throw new OCSForbiddenException($e->getMessage(), $e);
} catch (Exception $e) {
+ $this->logger->error('Error when deleting flow with id ' . $id, ['exception' => $e]);
throw new OCSException('An internal error occurred', $e->getCode(), $e);
}
}