mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-03-19 23:07:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1313 from Alkarex/postgresql-patch

Browse Source 
PostgreSQL compatibility boolean
This commit is contained in:
Alexandre Alapetite
2016-10-15 00:50:49 +02:00
committed by GitHub
parent bfb252a0f3 d184478fb4
commit 7ec73a91bc
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Models/EntryDAO.php
View File

@@ -273,15 +273,19 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
. 'WHERE e.is_read=0 '
. 'GROUP BY e.id_feed'
. ') x ON x.id_feed=f.id '
. 'SET f.`cache_nbUnreads`=COALESCE(x.nbUnreads, 0) '
. 'WHERE 1';
. 'SET f.`cache_nbUnreads`=COALESCE(x.nbUnreads, 0)';
$hasWhere = false;
$values = array();
if ($feedId !== false) {
$sql .= ' AND f.id=?';
$sql .= $hasWhere ? ' AND' : ' WHERE';
$hasWhere = true;
$sql .= ' f.id=?';
$values[] = $id;
}
if ($catId !== false) {
$sql .= ' AND f.category=?';
$sql .= $hasWhere ? ' AND' : ' WHERE';
$hasWhere = true;
$sql .= ' f.category=?';
$values[] = $catId;
}
$stm = $this->bd->prepare($sql);

12
app/Models/EntryDAOSQLite.php
View File

@@ -30,15 +30,19 @@ class FreshRSS_EntryDAOSQLite extends FreshRSS_EntryDAO {
$sql = 'UPDATE `' . $this->prefix . 'feed` '
. 'SET `cache_nbUnreads`=('
. 'SELECT COUNT(*) AS nbUnreads FROM `' . $this->prefix . 'entry` e '
. 'WHERE e.id_feed=`' . $this->prefix . 'feed`.id AND e.is_read=0) '
. 'WHERE 1';
. 'WHERE e.id_feed=`' . $this->prefix . 'feed`.id AND e.is_read=0)';
$hasWhere = false;
$values = array();
if ($feedId !== false) {
$sql .= ' AND id=?';
$sql .= $hasWhere ? ' AND' : ' WHERE';
$hasWhere = true;
$sql .= ' id=?';
$values[] = $feedId;
}
if ($catId !== false) {
$sql .= ' AND category=?';
$sql .= $hasWhere ? ' AND' : ' WHERE';
$hasWhere = true;
$sql .= ' category=?';
$values[] = $catId;
}
$stm = $this->bd->prepare($sql);