aboutsummaryrefslogtreecommitdiff
path: root/app/Models/DatabaseDAO.php
diff options
context:
space:
mode:
Diffstat (limited to 'app/Models/DatabaseDAO.php')
-rw-r--r--app/Models/DatabaseDAO.php16
1 files changed, 4 insertions, 12 deletions
diff --git a/app/Models/DatabaseDAO.php b/app/Models/DatabaseDAO.php
index 45fc1967c..1f31f161a 100644
--- a/app/Models/DatabaseDAO.php
+++ b/app/Models/DatabaseDAO.php
@@ -214,22 +214,14 @@ SQL;
return $ok;
}
- private function ensureYear2038Compatible(): bool {
- if ($this->pdo->dbType() !== 'sqlite') {
- include_once(APP_PATH . '/SQL/install.sql.' . $this->pdo->dbType() . '.php');
- if ($this->pdo->exec($GLOBALS['SQL_UPDATE_YEAR_2038']) === false) { //FreshRSS 1.23
- Minz_Log::error('SQL error ' . __METHOD__ . json_encode($this->pdo->errorInfo()));
- return false;
- }
- }
- return true;
- }
-
public function minorDbMaintenance(): void {
$catDAO = FreshRSS_Factory::createCategoryDao();
$catDAO->resetDefaultCategoryName();
- $this->ensureYear2038Compatible();
+ include_once(APP_PATH . '/SQL/install.sql.' . $this->pdo->dbType() . '.php');
+ if (!empty($GLOBALS['SQL_UPDATE_MINOR']) && $this->pdo->exec($GLOBALS['SQL_UPDATE_MINOR']) === false) {
+ Minz_Log::error('SQL error ' . __METHOD__ . json_encode($this->pdo->errorInfo()));
+ }
}
private static function stdError(string $error): bool {