PostgreSQL compatibility boolean

https://github.com/FreshRSS/FreshRSS/issues/1311
pull/1313/head
Alexandre Alapetite 8 years ago
parent 1013c7d2e2
commit d184478fb4
  1. 12
      app/Models/EntryDAO.php
  2. 12
      app/Models/EntryDAOSQLite.php

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

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

Loading…
Cancel
Save