diff options
author | Nicolas LÅ“uillet <nicolas.loeuillet@gmail.com> | 2014-01-07 04:20:23 -0800 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas.loeuillet@gmail.com> | 2014-01-07 04:20:23 -0800 |
commit | b4b22940dfbb8b56422e244272d22b7741e6ce7c (patch) | |
tree | 4ab486d3f7dc77a3fab521faff8e72da8dd3de0b /inc/poche/Database.class.php | |
parent | 60fc4f4b1ab37fbfe9021f3fa1395d66a4424ed2 (diff) | |
parent | e1cf0fda27df031e478e55d6df08823d42fe2220 (diff) | |
download | wallabag-b4b22940dfbb8b56422e244272d22b7741e6ce7c.tar.gz wallabag-b4b22940dfbb8b56422e244272d22b7741e6ce7c.tar.zst wallabag-b4b22940dfbb8b56422e244272d22b7741e6ce7c.zip |
Merge pull request #387 from inthepoche/dev1.3.1
poche 1.3.1
Diffstat (limited to 'inc/poche/Database.class.php')
-rw-r--r-- | inc/poche/Database.class.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/inc/poche/Database.class.php b/inc/poche/Database.class.php index afe02a41..04731821 100644 --- a/inc/poche/Database.class.php +++ b/inc/poche/Database.class.php | |||
@@ -81,7 +81,7 @@ class Database { | |||
81 | 81 | ||
82 | if (STORAGE == 'sqlite') { | 82 | if (STORAGE == 'sqlite') { |
83 | $sql = ' | 83 | $sql = ' |
84 | CREATE TABLE tags_entries ( | 84 | CREATE TABLE IF NOT EXISTS tags_entries ( |
85 | id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL UNIQUE, | 85 | id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL UNIQUE, |
86 | entry_id INTEGER, | 86 | entry_id INTEGER, |
87 | tag_id INTEGER, | 87 | tag_id INTEGER, |
@@ -337,7 +337,7 @@ class Database { | |||
337 | 337 | ||
338 | public function retrieveEntriesByTag($tag_id) { | 338 | public function retrieveEntriesByTag($tag_id) { |
339 | $sql = | 339 | $sql = |
340 | "SELECT * FROM entries | 340 | "SELECT entries.* FROM entries |
341 | LEFT JOIN tags_entries ON tags_entries.entry_id=entries.id | 341 | LEFT JOIN tags_entries ON tags_entries.entry_id=entries.id |
342 | WHERE tags_entries.tag_id = ?"; | 342 | WHERE tags_entries.tag_id = ?"; |
343 | $query = $this->executeQuery($sql, array($tag_id)); | 343 | $query = $this->executeQuery($sql, array($tag_id)); |
@@ -348,7 +348,7 @@ class Database { | |||
348 | 348 | ||
349 | public function retrieveTagsByEntry($entry_id) { | 349 | public function retrieveTagsByEntry($entry_id) { |
350 | $sql = | 350 | $sql = |
351 | "SELECT * FROM tags | 351 | "SELECT tags.* FROM tags |
352 | LEFT JOIN tags_entries ON tags_entries.tag_id=tags.id | 352 | LEFT JOIN tags_entries ON tags_entries.tag_id=tags.id |
353 | WHERE tags_entries.entry_id = ?"; | 353 | WHERE tags_entries.entry_id = ?"; |
354 | $query = $this->executeQuery($sql, array($entry_id)); | 354 | $query = $this->executeQuery($sql, array($entry_id)); |