[add] check tags tables

diff --git a/inc/poche/Database.class.php b/inc/poche/Database.class.php
index d95b9b8101c08903bd4dfa80875697aca957b9db..d7e9fc11592213a763f3b2d0ea8ffadf2f0d3a25 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 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) {

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 4b26574d08433c194bfacce40daadb20fd3bcc46..4f70afb755c2a0188af55973ca7dd4ab5b7a4ee6 100644 (file)
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -49,6 +49,7 @@ class Poche
             if (! $this->store->isInstalled()) {
                 $this->install();
             }
+            $this->store->checkTags();
         }
     }
     
@@ -659,7 +660,7 @@ class Poche
         if(isset($_SERVER['REMOTE_USER'])) {
             return array($_SERVER['REMOTE_USER'],'http_auth');
         }
-        
+
         return array(false,false);
      }