From 9e65732ea15fe05509a202e57e44ed289a0022a3 Mon Sep 17 00:00:00 2001 From: Shish Date: Sun, 11 Mar 2012 01:52:25 +0000 Subject: [PATCH] mysql ignores the FK names anyway, so all they were doing was bothering me ~_~ --- contrib/bookmarks/main.php | 2 +- contrib/favorites/main.php | 8 ++++---- contrib/ipban/main.php | 2 +- contrib/numeric_score/main.php | 4 ++-- contrib/pm/main.php | 8 ++++---- contrib/report_image/main.php | 4 ++-- contrib/tag_history/main.php | 4 ++-- contrib/wiki/main.php | 2 +- ext/comment/main.php | 8 ++++---- ext/upgrade/main.php | 2 +- install.php | 6 +++--- 11 files changed, 25 insertions(+), 25 deletions(-) diff --git a/contrib/bookmarks/main.php b/contrib/bookmarks/main.php index 3464c059..381ab7da 100644 --- a/contrib/bookmarks/main.php +++ b/contrib/bookmarks/main.php @@ -43,7 +43,7 @@ class Bookmarks extends Extension { url TEXT NOT NULL, title TEXT NOT NULL, 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); } diff --git a/contrib/favorites/main.php b/contrib/favorites/main.php index 70426703..35d3c7f0 100644 --- a/contrib/favorites/main.php +++ b/contrib/favorites/main.php @@ -148,8 +148,8 @@ class Favorites extends Extension { created_at DATETIME NOT NULL, INDEX(image_id), UNIQUE(image_id, user_id), - CONSTRAINT foreign_user_favorites_user_id 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 (user_id) REFERENCES users(id) ON DELETE CASCADE, + FOREIGN KEY (image_id) REFERENCES images(id) ON DELETE CASCADE ) "); $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)"); 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 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 (user_id) REFERENCES users(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); } } diff --git a/contrib/ipban/main.php b/contrib/ipban/main.php index be41efed..4dd485ed 100644 --- a/contrib/ipban/main.php +++ b/contrib/ipban/main.php @@ -161,7 +161,7 @@ class IPBan extends Extension { } 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); } } diff --git a/contrib/numeric_score/main.php b/contrib/numeric_score/main.php index ca9179b8..8baae0a1 100644 --- a/contrib/numeric_score/main.php +++ b/contrib/numeric_score/main.php @@ -252,8 +252,8 @@ class NumericScore extends Extension { score INTEGER NOT NULL, UNIQUE(image_id, user_id), INDEX(image_id), - CONSTRAINT foreign_numeric_score_votes_image_id 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 (image_id) REFERENCES images(id) ON DELETE CASCADE, + FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE "); $config->set_int("ext_numeric_score_version", 1); } diff --git a/contrib/pm/main.php b/contrib/pm/main.php index 0b2180f3..29e4b941 100644 --- a/contrib/pm/main.php +++ b/contrib/pm/main.php @@ -58,8 +58,8 @@ class PrivMsg extends Extension { message TEXT NOT NULL, is_read SCORE_BOOL NOT NULL DEFAULT SCORE_BOOL_N, INDEX (to_id), - CONSTRAINT foreign_private_message_from_id 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 (from_id) REFERENCES users(id) ON DELETE CASCADE, + FOREIGN KEY (to_id) REFERENCES users(id) ON DELETE CASCADE "); $config->set_int("pm_version", 2); 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 from_id not in (select id from users);"); $database->Execute("ALTER TABLE private_message - ADD CONSTRAINT foreign_private_message_from_id 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 (from_id) REFERENCES users(id) ON DELETE CASCADE, + ADD FOREIGN KEY (to_id) REFERENCES users(id) ON DELETE CASCADE;"); $config->set_int("pm_version", 2); log_info("pm", "extension installed"); } diff --git a/contrib/report_image/main.php b/contrib/report_image/main.php index 846e1fef..71dd2de1 100644 --- a/contrib/report_image/main.php +++ b/contrib/report_image/main.php @@ -118,8 +118,8 @@ class ReportImage extends Extension { image_id INTEGER NOT NULL, reporter_id INTEGER NOT NULL, reason TEXT NOT NULL, - CONSTRAINT foreign_image_reports_image_id 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 (image_id) REFERENCES images(id) ON DELETE CASCADE, + FOREIGN KEY (reporter_id) REFERENCES users(id) ON DELETE CASCADE "); $config->set_int("ext_report_image_version", 1); } diff --git a/contrib/tag_history/main.php b/contrib/tag_history/main.php index 80d3dbba..0eb6e30d 100644 --- a/contrib/tag_history/main.php +++ b/contrib/tag_history/main.php @@ -115,8 +115,8 @@ class Tag_History extends Extension { tags TEXT NOT NULL, date_set DATETIME NOT NULL, INDEX(image_id), - CONSTRAINT foreign_tag_histories_image_id 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 (image_id) REFERENCES images(id) ON DELETE CASCADE, + FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE "); $config->set_int("ext_tag_history_version", 3); } diff --git a/contrib/wiki/main.php b/contrib/wiki/main.php index df1193e0..f289f04d 100644 --- a/contrib/wiki/main.php +++ b/contrib/wiki/main.php @@ -69,7 +69,7 @@ class Wiki extends Extension { locked SCORE_BOOL NOT NULL DEFAULT SCORE_BOOL_N, body TEXT NOT NULL, 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); } diff --git a/ext/comment/main.php b/ext/comment/main.php index 38218f55..93a867df 100644 --- a/ext/comment/main.php +++ b/ext/comment/main.php @@ -83,8 +83,8 @@ class CommentList extends Extension { INDEX (image_id), INDEX (owner_ip), INDEX (posted), - CONSTRAINT foreign_comments_image_id 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 (image_id) REFERENCES images(id) ON DELETE CASCADE, + FOREIGN KEY (owner_id) REFERENCES users(id) ON DELETE RESTRICT "); $config->set_int("ext_comments_version", 3); } @@ -111,8 +111,8 @@ class CommentList extends Extension { if($config->get_int("ext_comments_version") == 2) { $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 CONSTRAINT foreign_comments_owner_id FOREIGN KEY (owner_id) REFERENCES users(id) ON DELETE RESTRICT"); + $database->Execute("ALTER TABLE comments ADD FOREIGN KEY (image_id) REFERENCES images(id) ON DELETE CASCADE"); + $database->Execute("ALTER TABLE comments ADD FOREIGN KEY (owner_id) REFERENCES users(id) ON DELETE RESTRICT"); } // FIXME: add foreign keys, bump to v3 diff --git a/ext/upgrade/main.php b/ext/upgrade/main.php index a77494e9..5471d573 100644 --- a/ext/upgrade/main.php +++ b/ext/upgrade/main.php @@ -57,7 +57,7 @@ class Upgrade extends Extension { $config->set_int("db_version", 10); 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"); $config->set_bool("in_upgrade", false); diff --git a/install.php b/install.php index 404517ed..142fa9f5 100644 --- a/install.php +++ b/install.php @@ -332,7 +332,7 @@ function create_tables() { // {{{ INDEX(owner_id), INDEX(width), 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", " id SCORE_AIPK, @@ -345,8 +345,8 @@ function create_tables() { // {{{ INDEX(image_id), INDEX(tag_id), UNIQUE(image_id, tag_id), - CONSTRAINT foreign_image_tags_image_id 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 (image_id) REFERENCES images(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)"); }