mirror of
https://github.com/FreshRSS/FreshRSS.git
synced 2026-03-27 02:32:49 -04:00
* Implement filter on last modified date by server Especially relevant for API, to get the modified changes: the API will now return the articles that are new or which content has been modified since `ot`: fix https://github.com/FreshRSS/FreshRSS/issues/7304 fix https://github.com/FreshRSS/FreshRSS/issues/2566 https://github.com/jocmp/capyreader/discussions/533#discussioncomment-11341808 New corresponding search operator `mdate:` and new UI: <img width="650" height="627" alt="image" src="https://github.com/user-attachments/assets/8ba02937-abc7-44bf-b718-cf269cc37caf" /> * Migration from existing id column * Fix auto-update * Index after update for performance * Minor comment * Minor whitespace * Fix regex * Minor .gitignore * Changelog and warning * Update app/i18n/pl/gen.php Co-authored-by: Inverle <inverle@proton.me> * make fix-all * Optimise SQL auto-update For speed and resilience * Minor SQLite change of sequence * Changelog * Speed optimisation: No DEFAULT 0 * Better migration * Revert small bug * Prepare filtering on multiple dates for API * make fix-all * Update tests * Remaining manual merge * Update versions * Remove warnings no longer relevant in changelog * Implement in API, and COALESCE * No lastModified when adding new article * Rework logic * Sort IS NOT NULL * Remove forgotten lastModified --------- Co-authored-by: Inverle <inverle@proton.me>
117 lines
3.6 KiB
PHP
117 lines
3.6 KiB
PHP
<?php
|
|
declare(strict_types=1);
|
|
|
|
class FreshRSS_EntryDAOPGSQL extends FreshRSS_EntryDAOSQLite {
|
|
|
|
#[\Override]
|
|
public static function hasNativeHex(): bool {
|
|
return true;
|
|
}
|
|
|
|
#[\Override]
|
|
public static function sqlHexDecode(string $x): string {
|
|
return 'decode(' . $x . ", 'hex')";
|
|
}
|
|
|
|
#[\Override]
|
|
public static function sqlHexEncode(string $x): string {
|
|
return 'encode(' . $x . ", 'hex')";
|
|
}
|
|
|
|
#[\Override]
|
|
public static function sqlIgnoreConflict(string $sql): string {
|
|
return rtrim($sql, ' ;') . ' ON CONFLICT DO NOTHING';
|
|
}
|
|
|
|
#[\Override]
|
|
protected static function sqlLimitAll(): string {
|
|
// https://www.postgresql.org/docs/current/queries-limit.html
|
|
return 'ALL';
|
|
}
|
|
|
|
#[\Override]
|
|
public static function sqlRandom(): string {
|
|
return 'RANDOM()';
|
|
}
|
|
|
|
#[\Override]
|
|
protected static function sqlRegex(string $expression, string $regex, array &$values): string {
|
|
$matches = static::regexToSql($regex);
|
|
if (isset($matches['pattern'])) {
|
|
$replacements = [ // Convert some of the PCRE regex syntax to PostgreSQL
|
|
'\\b' => '\\y', // matches only at the beginning or end of a word (was: backspace)
|
|
'\\B' => '\\Y', // matches only at a point that is not the beginning or end of a word (was: backslash)
|
|
];
|
|
$matches['pattern'] = str_replace(array_keys($replacements), array_values($replacements), $matches['pattern']);
|
|
|
|
$matchType = $matches['matchType'] ?? '';
|
|
if (str_contains($matchType, 'm')) {
|
|
// newline-sensitive matching
|
|
$matches['pattern'] = '(?m)' . $matches['pattern'];
|
|
}
|
|
$values[] = $matches['pattern'];
|
|
if (str_contains($matchType, 'i')) {
|
|
// case-insensitive matching
|
|
return "{$expression} ~* ?";
|
|
} else {
|
|
// case-sensitive matching
|
|
return "{$expression} ~ ?";
|
|
}
|
|
}
|
|
return '';
|
|
}
|
|
|
|
#[\Override]
|
|
protected function registerSqlFunctions(string $sql): void {
|
|
// Nothing to do for PostgreSQL
|
|
}
|
|
|
|
/** @param array{0:string,1:int,2:string} $errorInfo */
|
|
#[\Override]
|
|
protected 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
|
|
foreach (['attributes', 'lastUserModified', 'lastModified'] as $column) {
|
|
if (str_contains($errorLines[0], $column)) {
|
|
return $this->addColumn($column);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
#[\Override]
|
|
public function commitNewEntries(): bool {
|
|
//TODO: Update to PostgreSQL 9.5+ syntax with ON CONFLICT DO NOTHING
|
|
$sql = <<<'SQL'
|
|
DO $$
|
|
DECLARE
|
|
maxrank bigint := (SELECT MAX(id) FROM `_entrytmp`);
|
|
rank bigint := (SELECT maxrank - COUNT(*) FROM `_entrytmp`);
|
|
BEGIN
|
|
INSERT INTO `_entry`
|
|
(id, guid, title, author, content, link, date, `lastSeen`, hash, is_read, is_favorite, id_feed, tags, attributes)
|
|
(SELECT rank + row_number() OVER(ORDER BY etmp.date, etmp.id) AS id, guid, title, author, content,
|
|
link, date, `lastSeen`, hash, is_read, is_favorite, id_feed, tags, attributes
|
|
FROM `_entrytmp` AS etmp
|
|
WHERE NOT EXISTS (
|
|
SELECT 1 FROM `_entry` AS ereal
|
|
WHERE (etmp.id = ereal.id) OR (etmp.id_feed = ereal.id_feed AND etmp.guid = ereal.guid))
|
|
ORDER BY etmp.date, etmp.id);
|
|
DELETE FROM `_entrytmp` WHERE id <= maxrank;
|
|
END $$;
|
|
SQL;
|
|
$hadTransaction = $this->pdo->inTransaction();
|
|
if (!$hadTransaction) {
|
|
$this->pdo->beginTransaction();
|
|
}
|
|
$result = $this->pdo->exec($sql) !== false;
|
|
if (!$hadTransaction) {
|
|
$this->pdo->commit();
|
|
}
|
|
return $result;
|
|
}
|
|
}
|