From a863072bfbdeb5493915023ba06321ef105709ec Mon Sep 17 00:00:00 2001 From: Daku Date: Sun, 2 Mar 2014 18:50:46 +0000 Subject: [PATCH] DATETIME > SCORE_DATETIME fixes #354 --- ext/artists/main.php | 16 ++++++++-------- ext/favorites/main.php | 8 +++----- ext/forum/main.php | 6 +++--- ext/image_hash_ban/main.php | 2 +- ext/ipban/main.php | 4 ++-- ext/notes/main.php | 6 +++--- ext/pm/main.php | 2 +- ext/pools/main.php | 4 ++-- ext/source_history/main.php | 2 +- ext/tag_history/main.php | 4 ++-- ext/wiki/main.php | 2 +- 11 files changed, 27 insertions(+), 29 deletions(-) diff --git a/ext/artists/main.php b/ext/artists/main.php index e0fbe3d5..48a0d3ca 100644 --- a/ext/artists/main.php +++ b/ext/artists/main.php @@ -59,8 +59,8 @@ class Artists extends Extension { id SCORE_AIPK, user_id INTEGER NOT NULL, name VARCHAR(255) NOT NULL, - created DATETIME NOT NULL, - updated DATETIME NOT NULL, + created SCORE_DATETIME NOT NULL, + updated SCORE_DATETIME NOT NULL, notes TEXT, FOREIGN KEY (user_id) REFERENCES users(id) ON UPDATE CASCADE ON DELETE CASCADE "); @@ -70,8 +70,8 @@ class Artists extends Extension { artist_id INTEGER NOT NULL, user_id INTEGER NOT NULL, name VARCHAR(255) NOT NULL, - created DATETIME NOT NULL, - updated DATETIME NOT NULL, + created SCORE_DATETIME NOT NULL, + updated SCORE_DATETIME NOT NULL, FOREIGN KEY (user_id) REFERENCES users(id) ON UPDATE CASCADE ON DELETE CASCADE, FOREIGN KEY (artist_id) REFERENCES artists (id) ON UPDATE CASCADE ON DELETE CASCADE "); @@ -79,8 +79,8 @@ class Artists extends Extension { id SCORE_AIPK, artist_id INTEGER NOT NULL, user_id INTEGER NOT NULL, - created DATETIME, - updated DATETIME, + created SCORE_DATETIME, + updated SCORE_DATETIME, alias VARCHAR(255), FOREIGN KEY (user_id) REFERENCES users(id) ON UPDATE CASCADE ON DELETE CASCADE, FOREIGN KEY (artist_id) REFERENCES artists (id) ON UPDATE CASCADE ON DELETE CASCADE @@ -89,8 +89,8 @@ class Artists extends Extension { id SCORE_AIPK, artist_id INTEGER NOT NULL, user_id INTEGER NOT NULL, - created DATETIME NOT NULL, - updated DATETIME NOT NULL, + created SCORE_DATETIME NOT NULL, + updated SCORE_DATETIME NOT NULL, url VARCHAR(1000) NOT NULL, FOREIGN KEY (user_id) REFERENCES users(id) ON UPDATE CASCADE ON DELETE CASCADE, FOREIGN KEY (artist_id) REFERENCES artists (id) ON UPDATE CASCADE ON DELETE CASCADE diff --git a/ext/favorites/main.php b/ext/favorites/main.php index d5f78616..35730893 100644 --- a/ext/favorites/main.php +++ b/ext/favorites/main.php @@ -148,16 +148,14 @@ class Favorites extends Extension { if($config->get_int("ext_favorites_version") < 1) { $database->Execute("ALTER TABLE images ADD COLUMN favorites INTEGER NOT NULL DEFAULT 0"); $database->Execute("CREATE INDEX images__favorites ON images(favorites)"); - $database->Execute(" - CREATE TABLE user_favorites ( + $database->create_table("user_favorites", " image_id INTEGER NOT NULL, user_id INTEGER NOT NULL, - created_at DATETIME NOT NULL, + created_at SCORE_DATETIME NOT NULL, UNIQUE(image_id, user_id), FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE, FOREIGN KEY (image_id) REFERENCES images(id) ON DELETE CASCADE - ) - "); + "); $database->execute("CREATE INDEX user_favorites_image_id_idx ON user_favorites(image_id)", array()); $config->set_int("ext_favorites_version", 1); } diff --git a/ext/forum/main.php b/ext/forum/main.php index 0e18c9f3..491f365b 100644 --- a/ext/forum/main.php +++ b/ext/forum/main.php @@ -27,8 +27,8 @@ class Forum extends Extension { sticky SCORE_BOOL NOT NULL DEFAULT SCORE_BOOL_N, title VARCHAR(255) NOT NULL, user_id INTEGER NOT NULL, - date DATETIME NOT NULL, - uptodate DATETIME NOT NULL, + date SCORE_DATETIME NOT NULL, + uptodate SCORE_DATETIME NOT NULL, FOREIGN KEY (user_id) REFERENCES users(id) ON UPDATE CASCADE ON DELETE RESTRICT "); $database->execute("CREATE INDEX forum_threads_date_idx ON forum_threads(date)", array()); @@ -37,7 +37,7 @@ class Forum extends Extension { id SCORE_AIPK, thread_id INTEGER NOT NULL, user_id INTEGER NOT NULL, - date DATETIME NOT NULL, + date SCORE_DATETIME NOT NULL, message TEXT, FOREIGN KEY (user_id) REFERENCES users(id) ON UPDATE CASCADE ON DELETE RESTRICT, FOREIGN KEY (thread_id) REFERENCES forum_threads (id) ON UPDATE CASCADE ON DELETE CASCADE diff --git a/ext/image_hash_ban/main.php b/ext/image_hash_ban/main.php index 513ee1cc..9ca7eaaf 100644 --- a/ext/image_hash_ban/main.php +++ b/ext/image_hash_ban/main.php @@ -36,7 +36,7 @@ class ImageBan extends Extension { $database->create_table("image_bans", " id SCORE_AIPK, hash CHAR(32) NOT NULL, - date DATETIME DEFAULT SCORE_NOW, + date SCORE_DATETIME DEFAULT SCORE_NOW, reason TEXT NOT NULL "); $config->set_int("ext_imageban_version", 1); diff --git a/ext/ipban/main.php b/ext/ipban/main.php index ec4aa693..cbd122a0 100644 --- a/ext/ipban/main.php +++ b/ext/ipban/main.php @@ -130,8 +130,8 @@ class IPBan extends Extension { $database->Execute("CREATE TABLE bans ( id int(11) NOT NULL auto_increment, ip char(15) default NULL, - date datetime default NULL, - end datetime default NULL, + date SCORE_DATETIME default NULL, + end SCORE_DATETIME default NULL, reason varchar(255) default NULL, PRIMARY KEY (id) )"); diff --git a/ext/notes/main.php b/ext/notes/main.php index 9f73dce4..4d020cfd 100644 --- a/ext/notes/main.php +++ b/ext/notes/main.php @@ -20,7 +20,7 @@ class Notes extends Extension { image_id INTEGER NOT NULL, user_id INTEGER NOT NULL, user_ip CHAR(15) NOT NULL, - date DATETIME NOT NULL, + date SCORE_DATETIME NOT NULL, x1 INTEGER NOT NULL, y1 INTEGER NOT NULL, height INTEGER NOT NULL, @@ -35,7 +35,7 @@ class Notes extends Extension { id SCORE_AIPK, image_id INTEGER NOT NULL, user_id INTEGER NOT NULL, - date DATETIME NOT NULL, + date SCORE_DATETIME NOT NULL, FOREIGN KEY (user_id) REFERENCES users(id) ON UPDATE CASCADE ON DELETE CASCADE, FOREIGN KEY (image_id) REFERENCES images(id) ON DELETE CASCADE "); @@ -49,7 +49,7 @@ class Notes extends Extension { image_id INTEGER NOT NULL, user_id INTEGER NOT NULL, user_ip CHAR(15) NOT NULL, - date DATETIME NOT NULL, + date SCORE_DATETIME NOT NULL, x1 INTEGER NOT NULL, y1 INTEGER NOT NULL, height INTEGER NOT NULL, diff --git a/ext/pm/main.php b/ext/pm/main.php index b18e0121..3af1993a 100644 --- a/ext/pm/main.php +++ b/ext/pm/main.php @@ -53,7 +53,7 @@ class PrivMsg extends Extension { from_id INTEGER NOT NULL, from_ip SCORE_INET NOT NULL, to_id INTEGER NOT NULL, - sent_date DATETIME NOT NULL, + sent_date SCORE_DATETIME NOT NULL, subject VARCHAR(64) NOT NULL, message TEXT NOT NULL, is_read SCORE_BOOL NOT NULL DEFAULT SCORE_BOOL_N, diff --git a/ext/pools/main.php b/ext/pools/main.php index dcd1b13c..9d8fa386 100644 --- a/ext/pools/main.php +++ b/ext/pools/main.php @@ -33,7 +33,7 @@ class Pools extends Extension { public SCORE_BOOL NOT NULL DEFAULT SCORE_BOOL_N, title VARCHAR(255) NOT NULL, description TEXT, - date DATETIME NOT NULL, + date SCORE_DATETIME NOT NULL, posts INTEGER NOT NULL DEFAULT 0, FOREIGN KEY (user_id) REFERENCES users(id) ON UPDATE CASCADE ON DELETE CASCADE "); @@ -51,7 +51,7 @@ class Pools extends Extension { action INTEGER NOT NULL, images TEXT, count INTEGER NOT NULL DEFAULT 0, - date DATETIME NOT NULL, + date SCORE_DATETIME NOT NULL, FOREIGN KEY (pool_id) REFERENCES pools(id) ON UPDATE CASCADE ON DELETE CASCADE, FOREIGN KEY (user_id) REFERENCES users(id) ON UPDATE CASCADE ON DELETE CASCADE "); diff --git a/ext/source_history/main.php b/ext/source_history/main.php index cc4debfd..3137a265 100644 --- a/ext/source_history/main.php +++ b/ext/source_history/main.php @@ -93,7 +93,7 @@ class Source_History extends Extension { user_id INTEGER NOT NULL, user_ip SCORE_INET NOT NULL, source TEXT NOT NULL, - date_set DATETIME NOT NULL, + date_set SCORE_DATETIME NOT NULL, FOREIGN KEY (image_id) REFERENCES images(id) ON DELETE CASCADE, FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE "); diff --git a/ext/tag_history/main.php b/ext/tag_history/main.php index fd62a41a..9550215f 100644 --- a/ext/tag_history/main.php +++ b/ext/tag_history/main.php @@ -93,7 +93,7 @@ class Tag_History extends Extension { user_id INTEGER NOT NULL, user_ip SCORE_INET NOT NULL, tags TEXT NOT NULL, - date_set DATETIME NOT NULL, + date_set SCORE_DATETIME NOT NULL, FOREIGN KEY (image_id) REFERENCES images(id) ON DELETE CASCADE, FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE "); @@ -103,7 +103,7 @@ class Tag_History extends Extension { if($config->get_int("ext_tag_history_version") == 1) { $database->Execute("ALTER TABLE tag_histories ADD COLUMN user_id INTEGER NOT NULL"); - $database->Execute("ALTER TABLE tag_histories ADD COLUMN date_set DATETIME NOT NULL"); + $database->Execute($database->scoreql_to_sql("ALTER TABLE tag_histories ADD COLUMN date_set SCORE_DATETIME NOT NULL")); $config->set_int("ext_tag_history_version", 2); } diff --git a/ext/wiki/main.php b/ext/wiki/main.php index 4026c2bd..b0c573bc 100644 --- a/ext/wiki/main.php +++ b/ext/wiki/main.php @@ -63,7 +63,7 @@ class Wiki extends Extension { id SCORE_AIPK, owner_id INTEGER NOT NULL, owner_ip SCORE_INET NOT NULL, - date DATETIME DEFAULT NULL, + date SCORE_DATETIME DEFAULT NULL, title VARCHAR(255) NOT NULL, revision INTEGER NOT NULL DEFAULT 1, locked SCORE_BOOL NOT NULL DEFAULT SCORE_BOOL_N,