diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2013-11-19 22:19:36 +0100 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2013-11-19 22:19:36 +0100 |
| commit | d2d26bf69c63821d0fa73f8b8b6dd78370f5d2d7 (patch) | |
| tree | 801eb09c18805a7afee48e914871a166b0dba2dc | |
| parent | cebf1d9fd9e8479dac300e2fad5ba1c41927b850 (diff) | |
SQL : UNIQUE(e.id_feed, e.guid)
Préparation de GUID en prévision de
https://github.com/marienfressinaud/FreshRSS/issues/202
| -rwxr-xr-x | app/models/Entry.php | 3 | ||||
| -rw-r--r-- | public/install.php | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/models/Entry.php b/app/models/Entry.php index 684b1921a..da296227a 100755 --- a/app/models/Entry.php +++ b/app/models/Entry.php @@ -200,7 +200,7 @@ class EntryDAO extends Model_pdo { $values = array ( $valuesTmp['id'], - substr($valuesTmp['guid'], 0, 511), + substr($valuesTmp['guid'], 0, 760), substr($valuesTmp['title'], 0, 255), substr($valuesTmp['author'], 0, 255), base64_encode (gzdeflate (serialize ($valuesTmp['content']))), @@ -260,7 +260,6 @@ class EntryDAO extends Model_pdo { . 'WHERE e.id=?'; $values = array ($is_favorite ? 1 : 0, $id); $stm = $this->bd->prepare ($sql); - if ($stm && $stm->execute ($values)) { return $stm->rowCount(); } else { diff --git a/public/install.php b/public/install.php index 287e14614..4471f2e95 100644 --- a/public/install.php +++ b/public/install.php @@ -43,7 +43,7 @@ define ('SQL_REQ_FEED', 'CREATE TABLE IF NOT EXISTS `%sfeed` ( define ('SQL_REQ_ENTRY', 'CREATE TABLE IF NOT EXISTS `%sentry` ( `id` char(6) NOT NULL, - `guid` varchar(511) NOT NULL, + `guid` varchar(760) CHARACTER SET latin1 NOT NULL, `title` varchar(255) NOT NULL, `author` varchar(255) NOT NULL, `content` text NOT NULL, @@ -55,6 +55,7 @@ define ('SQL_REQ_ENTRY', 'CREATE TABLE IF NOT EXISTS `%sentry` ( `tags` varchar(1023) NOT NULL, PRIMARY KEY (`id`), FOREIGN KEY (`id_feed`) REFERENCES %sfeed(id) ON DELETE CASCADE ON UPDATE CASCADE, + UNIQUE KEY (`id_feed`,`guid`), -- v0.7 INDEX (`is_favorite`), -- v0.7 INDEX (`is_read`), -- v0.7 INDEX (`date`) -- v0.7 //TODO: remove after https://github.com/marienfressinaud/FreshRSS/issues/202 |