diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2022-09-19 11:51:44 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2022-09-19 11:51:44 +0200 |
| commit | 412b60ca8380dd760225574746207cf8e90a2b43 (patch) | |
| tree | 8bbbf6925b4ec3de7032f3ea58c0ce5696d23218 /app/Models/CategoryDAO.php | |
| parent | 6813e16e95c631084029cc84f786acd87495c063 (diff) | |
Fix transaction rollbacks during auto-update (#4622)
#fix https://github.com/FreshRSS/FreshRSS/issues/4600
We first need to commit the SQL transaction before being able to auto-update.
Avoid error such as:
> 25P02: 7 ERROR: current transaction is aborted, commands ignored until end of transaction block
Diffstat (limited to 'app/Models/CategoryDAO.php')
| -rw-r--r-- | app/Models/CategoryDAO.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/Models/CategoryDAO.php b/app/Models/CategoryDAO.php index e9b873d72..e098c65e4 100644 --- a/app/Models/CategoryDAO.php +++ b/app/Models/CategoryDAO.php @@ -15,6 +15,9 @@ class FreshRSS_CategoryDAO extends Minz_ModelPdo implements FreshRSS_Searchable } protected function addColumn($name) { + if ($this->pdo->inTransaction()) { + $this->pdo->commit(); + } Minz_Log::warning(__method__ . ': ' . $name); try { if ($name === 'kind') { //v1.20.0 |