From 5e0093aa00a6b52df88f526a5b6f737eff057e0b Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Wed, 26 Nov 2025 23:47:29 +0100 Subject: [PATCH] Fix MariaDB updateCachedValues (#8255) Changed syntax for an even wider compatibility. Follow-up of https://github.com/FreshRSS/FreshRSS/pull/8254 Regression from https://github.com/FreshRSS/FreshRSS/pull/6957 MariaDB images on Docker Hub go back to 10.6, so changed documentation to indicate support from that version, as I cannot easily test even older versions. --- README.fr.md | 2 +- README.md | 2 +- app/Models/FeedDAO.php | 7 +++---- app/Models/FeedDAOPGSQL.php | 1 + docs/en/admins/02_Prerequisites.md | 2 +- docs/fr/users/01_Installation.md | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.fr.md b/README.fr.md index c845d5f92..783004879 100644 --- a/README.fr.md +++ b/README.fr.md @@ -66,7 +66,7 @@ FreshRSS n’est fourni avec aucune garantie. * Extensions requises : [cURL](https://www.php.net/curl), [DOM](https://www.php.net/dom), [JSON](https://www.php.net/json), [XML](https://www.php.net/xml), [session](https://www.php.net/session), [ctype](https://www.php.net/ctype) * Extensions recommandées : [PDO_SQLite](https://www.php.net/pdo-sqlite) (pour l’export/import), [GMP](https://www.php.net/gmp) (pour accès API sur plateformes < 64 bits), [IDN](https://www.php.net/intl.idn) (pour les noms de domaines internationalisés), [mbstring](https://www.php.net/mbstring) (pour le texte Unicode), [iconv](https://www.php.net/iconv) (pour conversion d’encodages), [ZIP](https://www.php.net/zip) (pour import/export), [zlib](https://www.php.net/zlib) (pour les flux compressés) * Extension pour base de données : [PDO_PGSQL](https://www.php.net/pdo-pgsql) ou [PDO_SQLite](https://www.php.net/pdo-sqlite) ou [PDO_MySQL](https://www.php.net/pdo-mysql) -* PostgreSQL 10+ ou SQLite ou MariaDB 10.0.5+ ou MySQL 8.0+ +* PostgreSQL 10+ ou SQLite ou MariaDB 10.6+ ou MySQL 8.0+ # [Installation](https://freshrss.github.io/FreshRSS/fr/users/01_Installation.html) diff --git a/README.md b/README.md index 16a563323..53e981ec2 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,7 @@ FreshRSS comes with absolutely no warranty. * Required extensions: [cURL](https://www.php.net/curl), [DOM](https://www.php.net/dom), [JSON](https://www.php.net/json), [XML](https://www.php.net/xml), [session](https://www.php.net/session), [ctype](https://www.php.net/ctype) * Recommended extensions: [PDO_SQLite](https://www.php.net/pdo-sqlite) (for export/import), [GMP](https://www.php.net/gmp) (for API access on 32-bit platforms), [IDN](https://www.php.net/intl.idn) (for Internationalized Domain Names), [mbstring](https://www.php.net/mbstring) (for Unicode strings), [iconv](https://www.php.net/iconv) (for charset conversion), [ZIP](https://www.php.net/zip) (for import/export), [zlib](https://www.php.net/zlib) (for compressed feeds) * Extension for database: [PDO_PGSQL](https://www.php.net/pdo-pgsql) or [PDO_SQLite](https://www.php.net/pdo-sqlite) or [PDO_MySQL](https://www.php.net/pdo-mysql) -* PostgreSQL 10+ or SQLite or MariaDB 10.0.5+ or MySQL 8.0+ +* PostgreSQL 10+ or SQLite or MariaDB 10.6+ or MySQL 8.0+ # [Installation](https://freshrss.github.io/FreshRSS/en/admins/03_Installation.html) diff --git a/app/Models/FeedDAO.php b/app/Models/FeedDAO.php index dcabf337b..a2c64977f 100644 --- a/app/Models/FeedDAO.php +++ b/app/Models/FeedDAO.php @@ -487,7 +487,8 @@ SQL; $whereEntryIdFeeds = 'id_feed IN (' . str_repeat('?,', count($feedIds) - 1) . '?)'; } $sql = <<FreshRSS 1.22.1: PHP 7.2+ | | PHP modules | Required: libxml, cURL, JSON, PDO_MySQL, PCRE and ctype.
Required (32-bit only): GMP
Recommended: Zlib, mbstring, iconv, ZipArchive
*For the whole modules list see [Dockerfile](https://github.com/FreshRSS/FreshRSS/blob/edge/Docker/Dockerfile-Alpine#L9-L11)* | | -| Database | **PostgreSQL 10+** | SQLite, MariaDB 10.0.5+, MySQL 8.0+ | +| Database | **PostgreSQL 10+** | SQLite, MariaDB 10.6+, MySQL 8.0+ | | Browser | **Firefox** | Chrome, Opera, Safari, or Edge | ## Getting the appropriate version of FreshRSS diff --git a/docs/fr/users/01_Installation.md b/docs/fr/users/01_Installation.md index 8236776fd..4ae6279cd 100644 --- a/docs/fr/users/01_Installation.md +++ b/docs/fr/users/01_Installation.md @@ -9,7 +9,7 @@ Il est toutefois de votre responsabilité de vérifier que votre hébergement pe | Serveur web | **Apache 2.4+** | nginx, lighttpd | | PHP | **PHP 8.1+** | FreshRSS 1.24.3 : PHP 7.4+
FreshRSS 1.22.1 : PHP 7.2+ | | Modules PHP | Requis : libxml, cURL, JSON, PDO_MySQL, PCRE et ctype
Requis (32 bits seulement) : GMP
Recommandé : Zlib, mbstring et iconv, ZipArchive
*Pour une liste complète des modules nécessaires voir le [Dockerfile](https://github.com/FreshRSS/FreshRSS/blob/edge/Docker/Dockerfile-Alpine#L9-L11)* | | -| Base de données | **PostgreSQL 10+** | SQLite, MariaDB 10.0.5+, MySQL 8.0+ | +| Base de données | **PostgreSQL 10+** | SQLite, MariaDB 10.6+, MySQL 8.0+ | | Navigateur | **Firefox** | Chrome, Opera, Safari, or Edge | ## Choisir la bonne version de FreshRSS