james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mysql ignores the FK names anyway, so all they were doing was bothering me ~_~

Browse Source
This commit is contained in:
Shish 2012-03-11 01:52:25 +00:00
parent f9a9290318
commit 9e65732ea1
11 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/bookmarks/main.php
View File

@ -43,7 +43,7 @@ class Bookmarks extends Extension {
url TEXT NOT NULL, url TEXT NOT NULL,
title TEXT NOT NULL, title TEXT NOT NULL,
INDEX (owner_id), INDEX (owner_id),
CONSTRAINT foreign_bookmark_owner_id FOREIGN KEY (owner_id) REFERENCES users(id) ON DELETE CASCADE FOREIGN KEY (owner_id) REFERENCES users(id) ON DELETE CASCADE
"); ");
$config->set_int("ext_bookmarks_version", 1); $config->set_int("ext_bookmarks_version", 1);
} }

8
contrib/favorites/main.php
View File

@ -148,8 +148,8 @@ class Favorites extends Extension {
created_at DATETIME NOT NULL, created_at DATETIME NOT NULL,
INDEX(image_id), INDEX(image_id),
UNIQUE(image_id, user_id), UNIQUE(image_id, user_id),
CONSTRAINT foreign_user_favorites_user_id FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE, FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE,
CONSTRAINT foreign_user_favorites_image_id FOREIGN KEY (image_id) REFERENCES images(id) ON DELETE CASCADE FOREIGN KEY (image_id) REFERENCES images(id) ON DELETE CASCADE
) )
"); ");
$config->set_int("ext_favorites_version", 1); $config->set_int("ext_favorites_version", 1);
@ -161,8 +161,8 @@ class Favorites extends Extension {
$database->Execute("DELETE FROM user_favorites WHERE image_id NOT IN (SELECT id FROM images)"); $database->Execute("DELETE FROM user_favorites WHERE image_id NOT IN (SELECT id FROM images)");
log_info("favorites", "Adding foreign keys to user favourites"); log_info("favorites", "Adding foreign keys to user favourites");
$database->Execute("ALTER TABLE user_favorites ADD CONSTRAINT foreign_user_favorites_user_id FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE;"); $database->Execute("ALTER TABLE user_favorites ADD FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE;");
$database->Execute("ALTER TABLE user_favorites ADD CONSTRAINT foreign_user_favorites_image_id FOREIGN KEY (image_id) REFERENCES images(id) ON DELETE CASCADE;"); $database->Execute("ALTER TABLE user_favorites ADD FOREIGN KEY (image_id) REFERENCES images(id) ON DELETE CASCADE;");
$config->set_int("ext_favorites_version", 2); $config->set_int("ext_favorites_version", 2);
} }
} }

2
contrib/ipban/main.php
View File

@ -161,7 +161,7 @@ class IPBan extends Extension {
} }
if($config->get_int("ext_ipban_version") == 6) { if($config->get_int("ext_ipban_version") == 6) {
$database->Execute("ALTER TABLE bans ADD CONSTRAINT foreign_bans_banner_id FOREIGN KEY (banner_id) REFERENCES users(id) ON DELETE CASCADE"); $database->Execute("ALTER TABLE bans ADD FOREIGN KEY (banner_id) REFERENCES users(id) ON DELETE CASCADE");
$config->set_int("ext_ipban_version", 7); $config->set_int("ext_ipban_version", 7);
} }
} }

4
contrib/numeric_score/main.php
View File

@ -252,8 +252,8 @@ class NumericScore extends Extension {
score INTEGER NOT NULL, score INTEGER NOT NULL,
UNIQUE(image_id, user_id), UNIQUE(image_id, user_id),
INDEX(image_id), INDEX(image_id),
CONSTRAINT foreign_numeric_score_votes_image_id FOREIGN KEY (image_id) REFERENCES images(id) ON DELETE CASCADE, FOREIGN KEY (image_id) REFERENCES images(id) ON DELETE CASCADE,
CONSTRAINT foreign_numeric_score_votes_user_id FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE
"); ");
$config->set_int("ext_numeric_score_version", 1); $config->set_int("ext_numeric_score_version", 1);
} }

8
contrib/pm/main.php
View File

@ -58,8 +58,8 @@ class PrivMsg extends Extension {
message TEXT NOT NULL, message TEXT NOT NULL,
is_read SCORE_BOOL NOT NULL DEFAULT SCORE_BOOL_N, is_read SCORE_BOOL NOT NULL DEFAULT SCORE_BOOL_N,
INDEX (to_id), INDEX (to_id),
CONSTRAINT foreign_private_message_from_id FOREIGN KEY (from_id) REFERENCES users(id) ON DELETE CASCADE, FOREIGN KEY (from_id) REFERENCES users(id) ON DELETE CASCADE,
CONSTRAINT foreign_private_message_to_id FOREIGN KEY (to_id) REFERENCES users(id) ON DELETE CASCADE FOREIGN KEY (to_id) REFERENCES users(id) ON DELETE CASCADE
"); ");
$config->set_int("pm_version", 2); $config->set_int("pm_version", 2);
log_info("pm", "extension installed"); log_info("pm", "extension installed");
@ -70,8 +70,8 @@ class PrivMsg extends Extension {
$database->Execute("delete from private_message where to_id not in (select id from users);"); $database->Execute("delete from private_message where to_id not in (select id from users);");
$database->Execute("delete from private_message where from_id not in (select id from users);"); $database->Execute("delete from private_message where from_id not in (select id from users);");
$database->Execute("ALTER TABLE private_message $database->Execute("ALTER TABLE private_message
ADD CONSTRAINT foreign_private_message_from_id FOREIGN KEY (from_id) REFERENCES users(id) ON DELETE CASCADE, ADD FOREIGN KEY (from_id) REFERENCES users(id) ON DELETE CASCADE,
ADD CONSTRAINT foreign_private_message_to_id FOREIGN KEY (to_id) REFERENCES users(id) ON DELETE CASCADE;"); ADD FOREIGN KEY (to_id) REFERENCES users(id) ON DELETE CASCADE;");
$config->set_int("pm_version", 2); $config->set_int("pm_version", 2);
log_info("pm", "extension installed"); log_info("pm", "extension installed");
} }

4
contrib/report_image/main.php
View File

@ -118,8 +118,8 @@ class ReportImage extends Extension {
image_id INTEGER NOT NULL, image_id INTEGER NOT NULL,
reporter_id INTEGER NOT NULL, reporter_id INTEGER NOT NULL,
reason TEXT NOT NULL, reason TEXT NOT NULL,
CONSTRAINT foreign_image_reports_image_id FOREIGN KEY (image_id) REFERENCES images(id) ON DELETE CASCADE, FOREIGN KEY (image_id) REFERENCES images(id) ON DELETE CASCADE,
CONSTRAINT foreign_image_reports_reporter_id FOREIGN KEY (reporter_id) REFERENCES users(id) ON DELETE CASCADE FOREIGN KEY (reporter_id) REFERENCES users(id) ON DELETE CASCADE
"); ");
$config->set_int("ext_report_image_version", 1); $config->set_int("ext_report_image_version", 1);
} }

4
contrib/tag_history/main.php
View File

@ -115,8 +115,8 @@ class Tag_History extends Extension {
tags TEXT NOT NULL, tags TEXT NOT NULL,
date_set DATETIME NOT NULL, date_set DATETIME NOT NULL,
INDEX(image_id), INDEX(image_id),
CONSTRAINT foreign_tag_histories_image_id FOREIGN KEY (image_id) REFERENCES images(id) ON DELETE CASCADE, FOREIGN KEY (image_id) REFERENCES images(id) ON DELETE CASCADE,
CONSTRAINT foreign_tag_histories_user_id FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE
"); ");
$config->set_int("ext_tag_history_version", 3); $config->set_int("ext_tag_history_version", 3);
} }

2
contrib/wiki/main.php
View File

@ -69,7 +69,7 @@ class Wiki extends Extension {
locked SCORE_BOOL NOT NULL DEFAULT SCORE_BOOL_N, locked SCORE_BOOL NOT NULL DEFAULT SCORE_BOOL_N,
body TEXT NOT NULL, body TEXT NOT NULL,
UNIQUE (title, revision), UNIQUE (title, revision),
CONSTRAINT foreign_wiki_pages_owner_id FOREIGN KEY (owner_id) REFERENCES users(id) ON DELETE RESTRICT FOREIGN KEY (owner_id) REFERENCES users(id) ON DELETE RESTRICT
"); ");
$config->set_int("ext_wiki_version", 2); $config->set_int("ext_wiki_version", 2);
} }

8
ext/comment/main.php
View File

@ -83,8 +83,8 @@ class CommentList extends Extension {
INDEX (image_id), INDEX (image_id),
INDEX (owner_ip), INDEX (owner_ip),
INDEX (posted), INDEX (posted),
CONSTRAINT foreign_comments_image_id FOREIGN KEY (image_id) REFERENCES images(id) ON DELETE CASCADE, FOREIGN KEY (image_id) REFERENCES images(id) ON DELETE CASCADE,
CONSTRAINT foreign_comments_owner_id FOREIGN KEY (owner_id) REFERENCES users(id) ON DELETE RESTRICT FOREIGN KEY (owner_id) REFERENCES users(id) ON DELETE RESTRICT
"); ");
$config->set_int("ext_comments_version", 3); $config->set_int("ext_comments_version", 3);
} }
@ -111,8 +111,8 @@ class CommentList extends Extension {
if($config->get_int("ext_comments_version") == 2) { if($config->get_int("ext_comments_version") == 2) {
$config->set_int("ext_comments_version", 3); $config->set_int("ext_comments_version", 3);
$database->Execute("ALTER TABLE comments ADD CONSTRAINT foreign_comments_image_id FOREIGN KEY (image_id) REFERENCES images(id) ON DELETE CASCADE"); $database->Execute("ALTER TABLE comments ADD FOREIGN KEY (image_id) REFERENCES images(id) ON DELETE CASCADE");
$database->Execute("ALTER TABLE comments ADD CONSTRAINT foreign_comments_owner_id FOREIGN KEY (owner_id) REFERENCES users(id) ON DELETE RESTRICT"); $database->Execute("ALTER TABLE comments ADD FOREIGN KEY (owner_id) REFERENCES users(id) ON DELETE RESTRICT");
} }
// FIXME: add foreign keys, bump to v3 // FIXME: add foreign keys, bump to v3

2
ext/upgrade/main.php
View File

@ -57,7 +57,7 @@ class Upgrade extends Extension {
$config->set_int("db_version", 10); $config->set_int("db_version", 10);
log_info("upgrade", "Adding foreign keys to images"); log_info("upgrade", "Adding foreign keys to images");
$database->Execute("ALTER TABLE images ADD CONSTRAINT foreign_images_owner_id FOREIGN KEY (owner_id) REFERENCES users(id) ON DELETE RESTRICT"); $database->Execute("ALTER TABLE images ADD FOREIGN KEY (owner_id) REFERENCES users(id) ON DELETE RESTRICT");
log_info("upgrade", "Database at version 10"); log_info("upgrade", "Database at version 10");
$config->set_bool("in_upgrade", false); $config->set_bool("in_upgrade", false);

6
install.php
View File

@ -332,7 +332,7 @@ function create_tables() { // {{{
INDEX(owner_id), INDEX(owner_id),
INDEX(width), INDEX(width),
INDEX(height), INDEX(height),
CONSTRAINT foreign_images_owner_id FOREIGN KEY (owner_id) REFERENCES users(id) ON DELETE RESTRICT FOREIGN KEY (owner_id) REFERENCES users(id) ON DELETE RESTRICT
"); ");
$db->create_table("tags", " $db->create_table("tags", "
id SCORE_AIPK, id SCORE_AIPK,
@ -345,8 +345,8 @@ function create_tables() { // {{{
INDEX(image_id), INDEX(image_id),
INDEX(tag_id), INDEX(tag_id),
UNIQUE(image_id, tag_id), UNIQUE(image_id, tag_id),
CONSTRAINT foreign_image_tags_image_id FOREIGN KEY (image_id) REFERENCES images(id) ON DELETE CASCADE, FOREIGN KEY (image_id) REFERENCES images(id) ON DELETE CASCADE,
CONSTRAINT foreign_image_tags_tag_id FOREIGN KEY (tag_id) REFERENCES tags(id) ON DELETE CASCADE FOREIGN KEY (tag_id) REFERENCES tags(id) ON DELETE CASCADE
"); ");
$db->execute("INSERT INTO config(name, value) VALUES('db_version', 11)"); $db->execute("INSERT INTO config(name, value) VALUES('db_version', 11)");
} }