Create sqlite table tags_entries only if not already exists

[github/wallabag/wallabag.git] / inc / poche / Database.class.php

diff --git a/inc/poche/Database.class.php b/inc/poche/Database.class.php
index d95b9b8101c08903bd4dfa80875697aca957b9db..04731821fb3311a6cd0e6180bfe5d8bc4ec9ebdb 100644 (file)
--- a/inc/poche/Database.class.php
+++ b/inc/poche/Database.class.php
@@ -39,12 +39,79 @@ class Database {
     public function isInstalled() {
         $sql = "SELECT username FROM users";
         $query = $this->executeQuery($sql, array());
+        if ($query == false) {
+            die(STORAGE . ' database looks empty. You have to create it (you can find database structure in install folder).');
+        }
         $hasAdmin = count($query->fetchAll());
 
         if ($hasAdmin == 0) 
-            return FALSE;
+            return false;
 
-        return TRUE;
+        return true;
+    }
+
+    public function checkTags() {
+
+        if (STORAGE == 'sqlite') {
+            $sql = '
+                CREATE TABLE IF NOT EXISTS tags (
+                    id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL UNIQUE,
+                    value TEXT
+                )';
+        }
+        elseif(STORAGE == 'mysql') {
+            $sql = '
+                CREATE TABLE IF NOT EXISTS `tags` (
+                  `id` int(11) NOT NULL AUTO_INCREMENT,
+                  `value` varchar(255) NOT NULL,
+                  PRIMARY KEY (`id`)
+                ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+            ';
+        }
+        else {
+            $sql = '
+                CREATE TABLE tags (
+                  id bigserial primary key,
+                  value varchar(255) NOT NULL
+                );
+            ';
+        }
+
+        $query = $this->executeQuery($sql, array());
+
+        if (STORAGE == 'sqlite') {
+            $sql = '
+                CREATE TABLE IF NOT EXISTS tags_entries (
+                    id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL UNIQUE,
+                    entry_id INTEGER,
+                    tag_id INTEGER,
+                    FOREIGN KEY(entry_id) REFERENCES entries(id) ON DELETE CASCADE,
+                    FOREIGN KEY(tag_id) REFERENCES tags(id) ON DELETE CASCADE
+                )';
+        }
+        elseif(STORAGE == 'mysql') {
+            $sql = '
+                CREATE TABLE IF NOT EXISTS `tags_entries` (
+                  `id` int(11) NOT NULL AUTO_INCREMENT,
+                  `entry_id` int(11) NOT NULL,
+                  `tag_id` int(11) NOT NULL,
+                  FOREIGN KEY(entry_id) REFERENCES entries(id) ON DELETE CASCADE,
+                  FOREIGN KEY(tag_id) REFERENCES tags(id) ON DELETE CASCADE,
+                  PRIMARY KEY (`id`)
+                ) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
+            ';
+        }
+        else {
+            $sql = '
+                CREATE TABLE tags_entries (
+                  id bigserial primary key,
+                  entry_id integer NOT NULL,
+                  tag_id integer NOT NULL
+                )
+            ';
+        }
+
+        $query = $this->executeQuery($sql, array());
     }
 
     public function install($login, $password) {
@@ -127,10 +194,10 @@ class Database {
         $config = $this->getConfigUser($userId);
         
         if (!isset ($user_config[$key])) {
-            $sql = "INSERT INTO users_config (`value`, `user_id`, `name`) VALUES (?, ?, ?)";
+            $sql = "INSERT INTO users_config (value, user_id, name) VALUES (?, ?, ?)";
         }
         else {
-            $sql = "UPDATE users_config SET `value`=? WHERE `user_id`=? AND `name`=?";
+            $sql = "UPDATE users_config SET value=? WHERE user_id=? AND name=?";
         }
 
         $params = array($value, $userId, $key);
@@ -270,7 +337,7 @@ class Database {
 
     public function retrieveEntriesByTag($tag_id) {
         $sql = 
-            "SELECT * FROM entries
+            "SELECT entries.* FROM entries
             LEFT JOIN tags_entries ON tags_entries.entry_id=entries.id
             WHERE tags_entries.tag_id = ?";
         $query = $this->executeQuery($sql, array($tag_id));
@@ -281,7 +348,7 @@ class Database {
 
     public function retrieveTagsByEntry($entry_id) {
         $sql = 
-            "SELECT * FROM tags
+            "SELECT tags.* FROM tags
             LEFT JOIN tags_entries ON tags_entries.tag_id=tags.id
             WHERE tags_entries.entry_id = ?";
         $query = $this->executeQuery($sql, array($entry_id));