mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-05-15 18:53:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Better SQL auto-update f.kind (#8148)

Browse Source 
Add a little help to make sure that feed.kind gets added during the first call.
Tested that replacing the DB with a backup from Febuary 2020 just works, automatically adding new columns since FreshRSS 1.20.0.
This commit is contained in:
Alexandre Alapetite
2025-10-24 12:49:29 +02:00
committed by GitHub
parent 90c69e04bb
commit 9833d81976
4 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Models/CategoryDAO.php
View File

@@ -94,6 +94,12 @@ class FreshRSS_CategoryDAO extends Minz_ModelPdo {
if (isset($errorInfo[0])) {
if ($errorInfo[0] === FreshRSS_DatabaseDAO::ER_BAD_FIELD_ERROR || $errorInfo[0] === FreshRSS_DatabaseDAOPGSQL::UNDEFINED_COLUMN) {
$errorLines = explode("\n", $errorInfo[2], 2); // The relevant column name is on the first line, other lines are noise
if (str_contains($errorLines[0], 'f.')) { // Coming from a feed sub-query
$feedDao = FreshRSS_Factory::createFeedDao();
if ($feedDao->autoUpdateDb($errorInfo)) {
return true;
}
}
foreach (['kind', 'lastUpdate', 'error', 'attributes'] as $column) {
if (str_contains($errorLines[0], $column)) {
return $this->addColumn($column);

9
app/Models/CategoryDAOSQLite.php
View File

@@ -11,6 +11,15 @@ class FreshRSS_CategoryDAOSQLite extends FreshRSS_CategoryDAO {
/** @param array{0:string,1:int,2:string} $errorInfo */
#[\Override]
protected function autoUpdateDb(array $errorInfo): bool {
if (isset($errorInfo[0])) {
$errorLines = explode("\n", $errorInfo[2], 2); // The relevant column name is on the first line, other lines are noise
if (str_contains($errorLines[0], 'f.')) { // Coming from a feed sub-query
$feedDao = FreshRSS_Factory::createFeedDao();
if ($feedDao->autoUpdateDb($errorInfo)) {
return true;
}
}
}
if (($tableInfo = $this->pdo->query("PRAGMA table_info('category')")) !== false) {
$columns = $tableInfo->fetchAll(PDO::FETCH_COLUMN, 1);
foreach (['kind', 'lastUpdate', 'error', 'attributes'] as $column) {

2
app/Models/FeedDAO.php
View File

@@ -23,7 +23,7 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo {
}
/** @param array{0:string,1:int,2:string} $errorInfo */
protected function autoUpdateDb(array $errorInfo): bool {
public function autoUpdateDb(array $errorInfo): bool {
if (isset($errorInfo[0])) {
if ($errorInfo[0] === FreshRSS_DatabaseDAO::ER_BAD_FIELD_ERROR || $errorInfo[0] === FreshRSS_DatabaseDAOPGSQL::UNDEFINED_COLUMN) {
$errorLines = explode("\n", $errorInfo[2], 2); // The relevant column name is on the first line, other lines are noise

4
app/Models/FeedDAOSQLite.php
View File

@@ -10,10 +10,10 @@ class FreshRSS_FeedDAOSQLite extends FreshRSS_FeedDAO {
/** @param array{0:string,1:int,2:string} $errorInfo */
#[\Override]
protected function autoUpdateDb(array $errorInfo): bool {
public function autoUpdateDb(array $errorInfo): bool {
if (($tableInfo = $this->pdo->query("PRAGMA table_info('feed')")) !== false) {
$columns = $tableInfo->fetchAll(PDO::FETCH_COLUMN, 1);
foreach (['attributes', 'kind'] as $column) {
foreach (['kind'] as $column) {
if (!in_array($column, $columns, true)) {
return $this->addColumn($column);
}