mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-11-27 11:31:05 +00:00
Code Issues Projects Releases Wiki Activity

[add] check tags tables

Browse source
This commit is contained in:
Nicolas Lœuillet 2013-12-23 10:35:09 +01:00
parent 1810c13b55
commit 5cfafc6110
2 changed files with 71 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
inc/poche/Database.class.php
View file

@ -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) {

3
inc/poche/Poche.class.php
View file

@ -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);
}