From 7a79717e102447f72f592fd48aa5d793bcdbf1c6 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Fri, 10 Jan 2025 08:47:52 +0100
Subject: Fix sqlite_version (#7205)

* Fix sqlite_version
for https://github.com/FreshRSS/FreshRSS/pull/7161

* Fix PostgreSQL
---
 app/Models/DatabaseDAO.php       | 6 +++++-
 app/Models/DatabaseDAOPGSQL.php  | 5 +++++
 app/Models/DatabaseDAOSQLite.php | 5 +++++
 3 files changed, 15 insertions(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/Models/DatabaseDAO.php b/app/Models/DatabaseDAO.php
index 5a58ea2ad..5a25b74a0 100644
--- a/app/Models/DatabaseDAO.php
+++ b/app/Models/DatabaseDAO.php
@@ -197,13 +197,17 @@ class FreshRSS_DatabaseDAO extends Minz_ModelPdo {
 		self::$staticVersion = $version;
 	}
 
+	protected function selectVersion(): string {
+		return $this->fetchValue('SELECT version()') ?? '';
+	}
+
 	public function version(): string {
 		if (self::$staticVersion !== null) {
 			return self::$staticVersion;
 		}
 		static $version = null;
 		if (!is_string($version)) {
-			$version = $this->fetchValue('SELECT version()') ?? '';
+			$version = $this->selectVersion();
 		}
 		return $version;
 	}
diff --git a/app/Models/DatabaseDAOPGSQL.php b/app/Models/DatabaseDAOPGSQL.php
index a183bdee6..3fa70cd88 100644
--- a/app/Models/DatabaseDAOPGSQL.php
+++ b/app/Models/DatabaseDAOPGSQL.php
@@ -59,6 +59,11 @@ SQL;
 		];
 	}
 
+	#[\Override]
+	protected function selectVersion(): string {
+		return $this->fetchValue('SELECT version()') ?? '';
+	}
+
 	#[\Override]
 	public function size(bool $all = false): int {
 		if ($all) {
diff --git a/app/Models/DatabaseDAOSQLite.php b/app/Models/DatabaseDAOSQLite.php
index c425135b5..13c73a2d7 100644
--- a/app/Models/DatabaseDAOSQLite.php
+++ b/app/Models/DatabaseDAOSQLite.php
@@ -72,6 +72,11 @@ class FreshRSS_DatabaseDAOSQLite extends FreshRSS_DatabaseDAO {
 		];
 	}
 
+	#[\Override]
+	protected function selectVersion(): string {
+		return $this->fetchValue('SELECT sqlite_version()') ?? '';
+	}
+
 	#[\Override]
 	public function size(bool $all = false): int {
 		$sum = 0;
-- 
cgit v1.2.3