From fc78d5c5edaa8b2388bb26776abc5e2be208e2d8 Mon Sep 17 00:00:00 2001 From: marc1706 Date: Thu, 6 Feb 2014 22:49:36 +0100 Subject: [PATCH 1/3] [ticket/212] Add missing schema data and improve user class for acp tests B3P-212 --- tests/mock/user.php | 19 + tests/schemas/firebird_schema.sql | 416 ++--------------- tests/schemas/mssql_schema.sql | 455 ++---------------- tests/schemas/mysql_40_schema.sql | 290 ++---------- tests/schemas/mysql_41_schema.sql | 290 ++---------- tests/schemas/oracle_schema.sql | 509 ++------------------- tests/schemas/postgres_schema.sql | 338 ++------------ tests/schemas/sqlite_schema.sql | 280 ++---------- tests/testframework/database_test_case.php | 1 - 9 files changed, 280 insertions(+), 2318 deletions(-) diff --git a/tests/mock/user.php b/tests/mock/user.php index cc420347..baed62e0 100644 --- a/tests/mock/user.php +++ b/tests/mock/user.php @@ -22,4 +22,23 @@ class user extends \PHPUnit_Framework_TestCase $this->lang[$key] = $column; } } + + public function add_lang_ext($ext, $file) + { + if ($ext != 'board3/portal') + { + return; // can't support other extensions + } + + if (file_exists(dirname(__FILE__) . '/../../language/en/' . $file . '.php')) + { + include_once(dirname(__FILE__) . '/../../language/en/' . $file . '.php'); + + $this->set($lang); + } + else + { + $this->markTestIncomplete('Unable to include language file ' . $file); + } + } } diff --git a/tests/schemas/firebird_schema.sql b/tests/schemas/firebird_schema.sql index 444dd730..9eeff241 100644 --- a/tests/schemas/firebird_schema.sql +++ b/tests/schemas/firebird_schema.sql @@ -361,7 +361,7 @@ CREATE TABLE phpbb_forums ( forum_desc_options INTEGER DEFAULT 7 NOT NULL, forum_desc_uid VARCHAR(8) CHARACTER SET NONE DEFAULT '' NOT NULL, forum_link VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, - forum_password VARCHAR(40) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, + forum_password VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, forum_style INTEGER DEFAULT 0 NOT NULL, forum_image VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, forum_rules BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL, @@ -545,9 +545,7 @@ CREATE TABLE phpbb_log ( log_ip VARCHAR(40) CHARACTER SET NONE DEFAULT '' NOT NULL, log_time INTEGER DEFAULT 0 NOT NULL, log_operation BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL, - log_data BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL, - album_id INTEGER DEFAULT 0 NOT NULL, - image_id INTEGER DEFAULT 0 NOT NULL + log_data BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL );; ALTER TABLE phpbb_log ADD PRIMARY KEY (log_id);; @@ -739,6 +737,43 @@ CREATE INDEX phpbb_poll_votes_topic_id ON phpbb_poll_votes(topic_id);; CREATE INDEX phpbb_poll_votes_vote_user_id ON phpbb_poll_votes(vote_user_id);; CREATE INDEX phpbb_poll_votes_vote_user_ip ON phpbb_poll_votes(vote_user_ip);; +# Table: 'phpbb_portal_modules' +CREATE TABLE phpbb_portal_modules ( + module_id INTEGER NOT NULL, + module_classname VARCHAR(64) CHARACTER SET NONE DEFAULT '' NOT NULL, + module_column INTEGER DEFAULT 0 NOT NULL, + module_order INTEGER DEFAULT 0 NOT NULL, + module_name VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, + module_image_src VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, + module_image_width INTEGER DEFAULT 0 NOT NULL, + module_image_height INTEGER DEFAULT 0 NOT NULL, + module_group_ids VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, + module_status INTEGER DEFAULT 1 NOT NULL +);; + +ALTER TABLE phpbb_portal_modules ADD PRIMARY KEY (module_id);; + + +CREATE GENERATOR phpbb_portal_modules_gen;; +SET GENERATOR phpbb_portal_modules_gen TO 0;; + +CREATE TRIGGER t_phpbb_portal_modules FOR phpbb_portal_modules +BEFORE INSERT +AS +BEGIN + NEW.module_id = GEN_ID(phpbb_portal_modules_gen, 1); +END;; + + +# Table: 'phpbb_portal_config' +CREATE TABLE phpbb_portal_config ( + config_name VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, + config_value BLOB SUB_TYPE TEXT CHARACTER SET NONE DEFAULT '' NOT NULL +);; + +ALTER TABLE phpbb_portal_config ADD PRIMARY KEY (config_name);; + + # Table: 'phpbb_posts' CREATE TABLE phpbb_posts ( post_id INTEGER NOT NULL, @@ -910,7 +945,7 @@ CREATE INDEX phpbb_privmsgs_to_usr_flder_id ON phpbb_privmsgs_to(user_id, folder CREATE TABLE phpbb_profile_fields ( field_id INTEGER NOT NULL, field_name VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, - field_type INTEGER DEFAULT 0 NOT NULL, + field_type VARCHAR(100) CHARACTER SET NONE DEFAULT '' NOT NULL, field_ident VARCHAR(20) CHARACTER SET NONE DEFAULT '' NOT NULL, field_length VARCHAR(20) CHARACTER SET NONE DEFAULT '' NOT NULL, field_minlen VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, @@ -959,7 +994,7 @@ CREATE TABLE phpbb_profile_fields_lang ( field_id INTEGER DEFAULT 0 NOT NULL, lang_id INTEGER DEFAULT 0 NOT NULL, option_id INTEGER DEFAULT 0 NOT NULL, - field_type INTEGER DEFAULT 0 NOT NULL, + field_type VARCHAR(100) CHARACTER SET NONE DEFAULT '' NOT NULL, lang_value VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE );; @@ -1118,8 +1153,7 @@ CREATE TABLE phpbb_sessions ( session_page VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, session_viewonline INTEGER DEFAULT 1 NOT NULL, session_autologin INTEGER DEFAULT 0 NOT NULL, - session_admin INTEGER DEFAULT 0 NOT NULL, - session_album_id INTEGER DEFAULT 0 NOT NULL + session_admin INTEGER DEFAULT 0 NOT NULL );; ALTER TABLE phpbb_sessions ADD PRIMARY KEY (session_id);; @@ -1127,7 +1161,6 @@ ALTER TABLE phpbb_sessions ADD PRIMARY KEY (session_id);; CREATE INDEX phpbb_sessions_session_time ON phpbb_sessions(session_time);; CREATE INDEX phpbb_sessions_session_user_id ON phpbb_sessions(session_user_id);; CREATE INDEX phpbb_sessions_session_fid ON phpbb_sessions(session_forum_id);; -CREATE INDEX phpbb_sessions_session_aid ON phpbb_sessions(session_album_id);; # Table: 'phpbb_sessions_keys' CREATE TABLE phpbb_sessions_keys ( @@ -1369,7 +1402,7 @@ CREATE TABLE phpbb_users ( user_regdate INTEGER DEFAULT 0 NOT NULL, username VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, username_clean VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, - user_password VARCHAR(40) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, + user_password VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, user_passchg INTEGER DEFAULT 0 NOT NULL, user_pass_convert INTEGER DEFAULT 0 NOT NULL, user_email VARCHAR(100) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, @@ -1510,366 +1543,3 @@ CREATE TABLE phpbb_zebra ( ALTER TABLE phpbb_zebra ADD PRIMARY KEY (user_id, zebra_id);; -# Table: 'phpbb_gallery_albums' -CREATE TABLE phpbb_gallery_albums ( - album_id INTEGER NOT NULL, - parent_id INTEGER DEFAULT 0 NOT NULL, - left_id INTEGER DEFAULT 1 NOT NULL, - right_id INTEGER DEFAULT 2 NOT NULL, - album_parents BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL, - album_type INTEGER DEFAULT 1 NOT NULL, - album_status INTEGER DEFAULT 1 NOT NULL, - album_contest INTEGER DEFAULT 0 NOT NULL, - album_name VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, - album_desc BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL, - album_desc_options INTEGER DEFAULT 7 NOT NULL, - album_desc_uid VARCHAR(8) CHARACTER SET NONE DEFAULT '' NOT NULL, - album_desc_bitfield VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, - album_user_id INTEGER DEFAULT 0 NOT NULL, - album_images INTEGER DEFAULT 0 NOT NULL, - album_images_real INTEGER DEFAULT 0 NOT NULL, - album_last_image_id INTEGER DEFAULT 0 NOT NULL, - album_image VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, - album_last_image_time INTEGER DEFAULT 0 NOT NULL, - album_last_image_name VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, - album_last_username VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, - album_last_user_colour VARCHAR(6) CHARACTER SET NONE DEFAULT '' NOT NULL, - album_last_user_id INTEGER DEFAULT 0 NOT NULL, - album_watermark INTEGER DEFAULT 1 NOT NULL, - album_sort_key VARCHAR(8) CHARACTER SET NONE DEFAULT '' NOT NULL, - album_sort_dir VARCHAR(8) CHARACTER SET NONE DEFAULT '' NOT NULL, - display_in_rrc INTEGER DEFAULT 1 NOT NULL, - display_on_index INTEGER DEFAULT 1 NOT NULL, - display_subalbum_list INTEGER DEFAULT 1 NOT NULL, - album_feed INTEGER DEFAULT 1 NOT NULL, - album_auth_access INTEGER DEFAULT 0 NOT NULL -);; - -ALTER TABLE phpbb_gallery_albums ADD PRIMARY KEY (album_id);; - - -CREATE GENERATOR phpbb_gallery_albums_gen;; -SET GENERATOR phpbb_gallery_albums_gen TO 0;; - -CREATE TRIGGER t_phpbb_gallery_albums FOR phpbb_gallery_albums -BEFORE INSERT -AS -BEGIN - NEW.album_id = GEN_ID(phpbb_gallery_albums_gen, 1); -END;; - - -# Table: 'phpbb_gallery_albums_track' -CREATE TABLE phpbb_gallery_albums_track ( - user_id INTEGER DEFAULT 0 NOT NULL, - album_id INTEGER DEFAULT 0 NOT NULL, - mark_time INTEGER DEFAULT 0 NOT NULL -);; - -ALTER TABLE phpbb_gallery_albums_track ADD PRIMARY KEY (user_id, album_id);; - - -# Table: 'phpbb_gallery_comments' -CREATE TABLE phpbb_gallery_comments ( - comment_id INTEGER NOT NULL, - comment_image_id INTEGER NOT NULL, - comment_user_id INTEGER DEFAULT 0 NOT NULL, - comment_username VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, - comment_user_colour VARCHAR(6) CHARACTER SET NONE DEFAULT '' NOT NULL, - comment_user_ip VARCHAR(40) CHARACTER SET NONE DEFAULT '' NOT NULL, - comment_signature INTEGER DEFAULT 0 NOT NULL, - comment_time INTEGER DEFAULT 0 NOT NULL, - comment BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL, - comment_uid VARCHAR(8) CHARACTER SET NONE DEFAULT '' NOT NULL, - comment_bitfield VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, - comment_edit_time INTEGER DEFAULT 0 NOT NULL, - comment_edit_count INTEGER DEFAULT 0 NOT NULL, - comment_edit_user_id INTEGER DEFAULT 0 NOT NULL -);; - -ALTER TABLE phpbb_gallery_comments ADD PRIMARY KEY (comment_id);; - -CREATE INDEX phpbb_gallery_comments_id ON phpbb_gallery_comments(comment_image_id);; -CREATE INDEX phpbb_gallery_comments_uid ON phpbb_gallery_comments(comment_user_id);; -CREATE INDEX phpbb_gallery_comments_ip ON phpbb_gallery_comments(comment_user_ip);; -CREATE INDEX phpbb_gallery_comments_time ON phpbb_gallery_comments(comment_time);; - -CREATE GENERATOR phpbb_gallery_comments_gen;; -SET GENERATOR phpbb_gallery_comments_gen TO 0;; - -CREATE TRIGGER t_phpbb_gallery_comments FOR phpbb_gallery_comments -BEFORE INSERT -AS -BEGIN - NEW.comment_id = GEN_ID(phpbb_gallery_comments_gen, 1); -END;; - - -# Table: 'phpbb_gallery_contests' -CREATE TABLE phpbb_gallery_contests ( - contest_id INTEGER NOT NULL, - contest_album_id INTEGER DEFAULT 0 NOT NULL, - contest_start INTEGER DEFAULT 0 NOT NULL, - contest_rating INTEGER DEFAULT 0 NOT NULL, - contest_end INTEGER DEFAULT 0 NOT NULL, - contest_marked INTEGER DEFAULT 0 NOT NULL, - contest_first INTEGER DEFAULT 0 NOT NULL, - contest_second INTEGER DEFAULT 0 NOT NULL, - contest_third INTEGER DEFAULT 0 NOT NULL -);; - -ALTER TABLE phpbb_gallery_contests ADD PRIMARY KEY (contest_id);; - - -CREATE GENERATOR phpbb_gallery_contests_gen;; -SET GENERATOR phpbb_gallery_contests_gen TO 0;; - -CREATE TRIGGER t_phpbb_gallery_contests FOR phpbb_gallery_contests -BEFORE INSERT -AS -BEGIN - NEW.contest_id = GEN_ID(phpbb_gallery_contests_gen, 1); -END;; - - -# Table: 'phpbb_gallery_favorites' -CREATE TABLE phpbb_gallery_favorites ( - favorite_id INTEGER NOT NULL, - user_id INTEGER DEFAULT 0 NOT NULL, - image_id INTEGER DEFAULT 0 NOT NULL -);; - -ALTER TABLE phpbb_gallery_favorites ADD PRIMARY KEY (favorite_id);; - -CREATE INDEX phpbb_gallery_favorites_uid ON phpbb_gallery_favorites(user_id);; -CREATE INDEX phpbb_gallery_favorites_id ON phpbb_gallery_favorites(image_id);; - -CREATE GENERATOR phpbb_gallery_favorites_gen;; -SET GENERATOR phpbb_gallery_favorites_gen TO 0;; - -CREATE TRIGGER t_phpbb_gallery_favorites FOR phpbb_gallery_favorites -BEFORE INSERT -AS -BEGIN - NEW.favorite_id = GEN_ID(phpbb_gallery_favorites_gen, 1); -END;; - - -# Table: 'phpbb_gallery_images' -CREATE TABLE phpbb_gallery_images ( - image_id INTEGER NOT NULL, - image_filename VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, - image_name VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, - image_name_clean VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, - image_desc BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL, - image_desc_uid VARCHAR(8) CHARACTER SET NONE DEFAULT '' NOT NULL, - image_desc_bitfield VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, - image_user_id INTEGER DEFAULT 0 NOT NULL, - image_username VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, - image_username_clean VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, - image_user_colour VARCHAR(6) CHARACTER SET NONE DEFAULT '' NOT NULL, - image_user_ip VARCHAR(40) CHARACTER SET NONE DEFAULT '' NOT NULL, - image_time INTEGER DEFAULT 0 NOT NULL, - image_album_id INTEGER DEFAULT 0 NOT NULL, - image_view_count INTEGER DEFAULT 0 NOT NULL, - image_status INTEGER DEFAULT 0 NOT NULL, - image_contest INTEGER DEFAULT 0 NOT NULL, - image_contest_end INTEGER DEFAULT 0 NOT NULL, - image_contest_rank INTEGER DEFAULT 0 NOT NULL, - image_filemissing INTEGER DEFAULT 0 NOT NULL, - image_has_exif INTEGER DEFAULT 2 NOT NULL, - image_exif_data BLOB SUB_TYPE TEXT CHARACTER SET NONE DEFAULT '' NOT NULL, - image_rates INTEGER DEFAULT 0 NOT NULL, - image_rate_points INTEGER DEFAULT 0 NOT NULL, - image_rate_avg INTEGER DEFAULT 0 NOT NULL, - image_comments INTEGER DEFAULT 0 NOT NULL, - image_last_comment INTEGER DEFAULT 0 NOT NULL, - image_allow_comments INTEGER DEFAULT 1 NOT NULL, - image_favorited INTEGER DEFAULT 0 NOT NULL, - image_reported INTEGER DEFAULT 0 NOT NULL, - filesize_upload INTEGER DEFAULT 0 NOT NULL, - filesize_medium INTEGER DEFAULT 0 NOT NULL, - filesize_cache INTEGER DEFAULT 0 NOT NULL -);; - -ALTER TABLE phpbb_gallery_images ADD PRIMARY KEY (image_id);; - -CREATE INDEX phpbb_gallery_images_aid ON phpbb_gallery_images(image_album_id);; -CREATE INDEX phpbb_gallery_images_uid ON phpbb_gallery_images(image_user_id);; -CREATE INDEX phpbb_gallery_images_time ON phpbb_gallery_images(image_time);; - -CREATE GENERATOR phpbb_gallery_images_gen;; -SET GENERATOR phpbb_gallery_images_gen TO 0;; - -CREATE TRIGGER t_phpbb_gallery_images FOR phpbb_gallery_images -BEFORE INSERT -AS -BEGIN - NEW.image_id = GEN_ID(phpbb_gallery_images_gen, 1); -END;; - - -# Table: 'phpbb_gallery_modscache' -CREATE TABLE phpbb_gallery_modscache ( - album_id INTEGER DEFAULT 0 NOT NULL, - user_id INTEGER DEFAULT 0 NOT NULL, - username VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, - group_id INTEGER DEFAULT 0 NOT NULL, - group_name VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, - display_on_index INTEGER DEFAULT 1 NOT NULL -);; - -CREATE INDEX phpbb_gallery_modscache_doi ON phpbb_gallery_modscache(display_on_index);; -CREATE INDEX phpbb_gallery_modscache_aid ON phpbb_gallery_modscache(album_id);; - -# Table: 'phpbb_gallery_permissions' -CREATE TABLE phpbb_gallery_permissions ( - perm_id INTEGER NOT NULL, - perm_role_id INTEGER DEFAULT 0 NOT NULL, - perm_album_id INTEGER DEFAULT 0 NOT NULL, - perm_user_id INTEGER DEFAULT 0 NOT NULL, - perm_group_id INTEGER DEFAULT 0 NOT NULL, - perm_system INTEGER DEFAULT 0 NOT NULL -);; - -ALTER TABLE phpbb_gallery_permissions ADD PRIMARY KEY (perm_id);; - - -CREATE GENERATOR phpbb_gallery_permissions_gen;; -SET GENERATOR phpbb_gallery_permissions_gen TO 0;; - -CREATE TRIGGER t_phpbb_gallery_permissions FOR phpbb_gallery_permissions -BEFORE INSERT -AS -BEGIN - NEW.perm_id = GEN_ID(phpbb_gallery_permissions_gen, 1); -END;; - - -# Table: 'phpbb_gallery_rates' -CREATE TABLE phpbb_gallery_rates ( - rate_image_id INTEGER DEFAULT 0 NOT NULL, - rate_user_id INTEGER DEFAULT 0 NOT NULL, - rate_user_ip VARCHAR(40) CHARACTER SET NONE DEFAULT '' NOT NULL, - rate_point INTEGER DEFAULT 0 NOT NULL -);; - -ALTER TABLE phpbb_gallery_rates ADD PRIMARY KEY (rate_image_id, rate_user_id);; - - -# Table: 'phpbb_gallery_reports' -CREATE TABLE phpbb_gallery_reports ( - report_id INTEGER NOT NULL, - report_album_id INTEGER DEFAULT 0 NOT NULL, - report_image_id INTEGER DEFAULT 0 NOT NULL, - reporter_id INTEGER DEFAULT 0 NOT NULL, - report_manager INTEGER DEFAULT 0 NOT NULL, - report_note BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL, - report_time INTEGER DEFAULT 0 NOT NULL, - report_status INTEGER DEFAULT 0 NOT NULL -);; - -ALTER TABLE phpbb_gallery_reports ADD PRIMARY KEY (report_id);; - - -CREATE GENERATOR phpbb_gallery_reports_gen;; -SET GENERATOR phpbb_gallery_reports_gen TO 0;; - -CREATE TRIGGER t_phpbb_gallery_reports FOR phpbb_gallery_reports -BEFORE INSERT -AS -BEGIN - NEW.report_id = GEN_ID(phpbb_gallery_reports_gen, 1); -END;; - - -# Table: 'phpbb_gallery_roles' -CREATE TABLE phpbb_gallery_roles ( - role_id INTEGER NOT NULL, - a_list INTEGER DEFAULT 0 NOT NULL, - i_view INTEGER DEFAULT 0 NOT NULL, - i_watermark INTEGER DEFAULT 0 NOT NULL, - i_upload INTEGER DEFAULT 0 NOT NULL, - i_edit INTEGER DEFAULT 0 NOT NULL, - i_delete INTEGER DEFAULT 0 NOT NULL, - i_rate INTEGER DEFAULT 0 NOT NULL, - i_approve INTEGER DEFAULT 0 NOT NULL, - i_lock INTEGER DEFAULT 0 NOT NULL, - i_report INTEGER DEFAULT 0 NOT NULL, - i_count INTEGER DEFAULT 0 NOT NULL, - i_unlimited INTEGER DEFAULT 0 NOT NULL, - c_read INTEGER DEFAULT 0 NOT NULL, - c_post INTEGER DEFAULT 0 NOT NULL, - c_edit INTEGER DEFAULT 0 NOT NULL, - c_delete INTEGER DEFAULT 0 NOT NULL, - m_comments INTEGER DEFAULT 0 NOT NULL, - m_delete INTEGER DEFAULT 0 NOT NULL, - m_edit INTEGER DEFAULT 0 NOT NULL, - m_move INTEGER DEFAULT 0 NOT NULL, - m_report INTEGER DEFAULT 0 NOT NULL, - m_status INTEGER DEFAULT 0 NOT NULL, - a_count INTEGER DEFAULT 0 NOT NULL, - a_unlimited INTEGER DEFAULT 0 NOT NULL, - a_restrict INTEGER DEFAULT 0 NOT NULL -);; - -ALTER TABLE phpbb_gallery_roles ADD PRIMARY KEY (role_id);; - - -CREATE GENERATOR phpbb_gallery_roles_gen;; -SET GENERATOR phpbb_gallery_roles_gen TO 0;; - -CREATE TRIGGER t_phpbb_gallery_roles FOR phpbb_gallery_roles -BEFORE INSERT -AS -BEGIN - NEW.role_id = GEN_ID(phpbb_gallery_roles_gen, 1); -END;; - - -# Table: 'phpbb_gallery_users' -CREATE TABLE phpbb_gallery_users ( - user_id INTEGER DEFAULT 0 NOT NULL, - watch_own INTEGER DEFAULT 0 NOT NULL, - watch_favo INTEGER DEFAULT 0 NOT NULL, - watch_com INTEGER DEFAULT 0 NOT NULL, - user_images INTEGER DEFAULT 0 NOT NULL, - personal_album_id INTEGER DEFAULT 0 NOT NULL, - user_lastmark INTEGER DEFAULT 0 NOT NULL, - user_last_update INTEGER DEFAULT 0 NOT NULL, - user_viewexif INTEGER DEFAULT 0 NOT NULL, - user_permissions BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL, - user_permissions_changed INTEGER DEFAULT 0 NOT NULL, - user_allow_comments INTEGER DEFAULT 1 NOT NULL, - subscribe_pegas INTEGER DEFAULT 0 NOT NULL -);; - -ALTER TABLE phpbb_gallery_users ADD PRIMARY KEY (user_id);; - -CREATE INDEX phpbb_gallery_users_pega ON phpbb_gallery_users(personal_album_id);; - -# Table: 'phpbb_gallery_watch' -CREATE TABLE phpbb_gallery_watch ( - watch_id INTEGER NOT NULL, - album_id INTEGER DEFAULT 0 NOT NULL, - image_id INTEGER DEFAULT 0 NOT NULL, - user_id INTEGER DEFAULT 0 NOT NULL -);; - -ALTER TABLE phpbb_gallery_watch ADD PRIMARY KEY (watch_id);; - -CREATE INDEX phpbb_gallery_watch_uid ON phpbb_gallery_watch(user_id);; -CREATE INDEX phpbb_gallery_watch_id ON phpbb_gallery_watch(image_id);; -CREATE INDEX phpbb_gallery_watch_aid ON phpbb_gallery_watch(album_id);; - -CREATE GENERATOR phpbb_gallery_watch_gen;; -SET GENERATOR phpbb_gallery_watch_gen TO 0;; - -CREATE TRIGGER t_phpbb_gallery_watch FOR phpbb_gallery_watch -BEFORE INSERT -AS -BEGIN - NEW.watch_id = GEN_ID(phpbb_gallery_watch_gen, 1); -END;; - - diff --git a/tests/schemas/mssql_schema.sql b/tests/schemas/mssql_schema.sql index bc1ae72e..357a84b9 100644 --- a/tests/schemas/mssql_schema.sql +++ b/tests/schemas/mssql_schema.sql @@ -448,7 +448,7 @@ CREATE TABLE [phpbb_forums] ( [forum_desc_options] [int] DEFAULT (7) NOT NULL , [forum_desc_uid] [varchar] (8) DEFAULT ('') NOT NULL , [forum_link] [varchar] (255) DEFAULT ('') NOT NULL , - [forum_password] [varchar] (40) DEFAULT ('') NOT NULL , + [forum_password] [varchar] (255) DEFAULT ('') NOT NULL , [forum_style] [int] DEFAULT (0) NOT NULL , [forum_image] [varchar] (255) DEFAULT ('') NOT NULL , [forum_rules] [varchar] (4000) DEFAULT ('') NOT NULL , @@ -658,9 +658,7 @@ CREATE TABLE [phpbb_log] ( [log_ip] [varchar] (40) DEFAULT ('') NOT NULL , [log_time] [int] DEFAULT (0) NOT NULL , [log_operation] [varchar] (4000) DEFAULT ('') NOT NULL , - [log_data] [text] DEFAULT ('') NOT NULL , - [album_id] [int] DEFAULT (0) NOT NULL , - [image_id] [int] DEFAULT (0) NOT NULL + [log_data] [text] DEFAULT ('') NOT NULL ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] GO @@ -920,6 +918,48 @@ CREATE INDEX [vote_user_ip] ON [phpbb_poll_votes]([vote_user_ip]) ON [PRIMARY] GO +/* + Table: 'phpbb_portal_modules' +*/ +CREATE TABLE [phpbb_portal_modules] ( + [module_id] [int] IDENTITY (1, 1) NOT NULL , + [module_classname] [varchar] (64) DEFAULT ('') NOT NULL , + [module_column] [int] DEFAULT (0) NOT NULL , + [module_order] [int] DEFAULT (0) NOT NULL , + [module_name] [varchar] (255) DEFAULT ('') NOT NULL , + [module_image_src] [varchar] (255) DEFAULT ('') NOT NULL , + [module_image_width] [int] DEFAULT (0) NOT NULL , + [module_image_height] [int] DEFAULT (0) NOT NULL , + [module_group_ids] [varchar] (255) DEFAULT ('') NOT NULL , + [module_status] [int] DEFAULT (1) NOT NULL +) ON [PRIMARY] +GO + +ALTER TABLE [phpbb_portal_modules] WITH NOCHECK ADD + CONSTRAINT [PK_phpbb_portal_modules] PRIMARY KEY CLUSTERED + ( + [module_id] + ) ON [PRIMARY] +GO + + +/* + Table: 'phpbb_portal_config' +*/ +CREATE TABLE [phpbb_portal_config] ( + [config_name] [varchar] (255) DEFAULT ('') NOT NULL , + [config_value] [text] DEFAULT ('') NOT NULL +) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] +GO + +ALTER TABLE [phpbb_portal_config] WITH NOCHECK ADD + CONSTRAINT [PK_phpbb_portal_config] PRIMARY KEY CLUSTERED + ( + [config_name] + ) ON [PRIMARY] +GO + + /* Table: 'phpbb_posts' */ @@ -1116,7 +1156,7 @@ GO CREATE TABLE [phpbb_profile_fields] ( [field_id] [int] IDENTITY (1, 1) NOT NULL , [field_name] [varchar] (255) DEFAULT ('') NOT NULL , - [field_type] [int] DEFAULT (0) NOT NULL , + [field_type] [varchar] (100) DEFAULT ('') NOT NULL , [field_ident] [varchar] (20) DEFAULT ('') NOT NULL , [field_length] [varchar] (20) DEFAULT ('') NOT NULL , [field_minlen] [varchar] (255) DEFAULT ('') NOT NULL , @@ -1174,7 +1214,7 @@ CREATE TABLE [phpbb_profile_fields_lang] ( [field_id] [int] DEFAULT (0) NOT NULL , [lang_id] [int] DEFAULT (0) NOT NULL , [option_id] [int] DEFAULT (0) NOT NULL , - [field_type] [int] DEFAULT (0) NOT NULL , + [field_type] [varchar] (100) DEFAULT ('') NOT NULL , [lang_value] [varchar] (255) DEFAULT ('') NOT NULL ) ON [PRIMARY] GO @@ -1365,8 +1405,7 @@ CREATE TABLE [phpbb_sessions] ( [session_page] [varchar] (255) DEFAULT ('') NOT NULL , [session_viewonline] [int] DEFAULT (1) NOT NULL , [session_autologin] [int] DEFAULT (0) NOT NULL , - [session_admin] [int] DEFAULT (0) NOT NULL , - [session_album_id] [int] DEFAULT (0) NOT NULL + [session_admin] [int] DEFAULT (0) NOT NULL ) ON [PRIMARY] GO @@ -1386,9 +1425,6 @@ GO CREATE INDEX [session_fid] ON [phpbb_sessions]([session_forum_id]) ON [PRIMARY] GO -CREATE INDEX [session_aid] ON [phpbb_sessions]([session_album_id]) ON [PRIMARY] -GO - /* Table: 'phpbb_sessions_keys' @@ -1687,7 +1723,7 @@ CREATE TABLE [phpbb_users] ( [user_regdate] [int] DEFAULT (0) NOT NULL , [username] [varchar] (255) DEFAULT ('') NOT NULL , [username_clean] [varchar] (255) DEFAULT ('') NOT NULL , - [user_password] [varchar] (40) DEFAULT ('') NOT NULL , + [user_password] [varchar] (255) DEFAULT ('') NOT NULL , [user_passchg] [int] DEFAULT (0) NOT NULL , [user_pass_convert] [int] DEFAULT (0) NOT NULL , [user_email] [varchar] (100) DEFAULT ('') NOT NULL , @@ -1834,398 +1870,3 @@ ALTER TABLE [phpbb_zebra] WITH NOCHECK ADD GO -/* - Table: 'phpbb_gallery_albums' -*/ -CREATE TABLE [phpbb_gallery_albums] ( - [album_id] [int] IDENTITY (1, 1) NOT NULL , - [parent_id] [int] DEFAULT (0) NOT NULL , - [left_id] [int] DEFAULT (1) NOT NULL , - [right_id] [int] DEFAULT (2) NOT NULL , - [album_parents] [text] DEFAULT ('') NOT NULL , - [album_type] [int] DEFAULT (1) NOT NULL , - [album_status] [int] DEFAULT (1) NOT NULL , - [album_contest] [int] DEFAULT (0) NOT NULL , - [album_name] [varchar] (255) DEFAULT ('') NOT NULL , - [album_desc] [text] DEFAULT ('') NOT NULL , - [album_desc_options] [int] DEFAULT (7) NOT NULL , - [album_desc_uid] [varchar] (8) DEFAULT ('') NOT NULL , - [album_desc_bitfield] [varchar] (255) DEFAULT ('') NOT NULL , - [album_user_id] [int] DEFAULT (0) NOT NULL , - [album_images] [int] DEFAULT (0) NOT NULL , - [album_images_real] [int] DEFAULT (0) NOT NULL , - [album_last_image_id] [int] DEFAULT (0) NOT NULL , - [album_image] [varchar] (255) DEFAULT ('') NOT NULL , - [album_last_image_time] [int] DEFAULT (0) NOT NULL , - [album_last_image_name] [varchar] (255) DEFAULT ('') NOT NULL , - [album_last_username] [varchar] (255) DEFAULT ('') NOT NULL , - [album_last_user_colour] [varchar] (6) DEFAULT ('') NOT NULL , - [album_last_user_id] [int] DEFAULT (0) NOT NULL , - [album_watermark] [int] DEFAULT (1) NOT NULL , - [album_sort_key] [varchar] (8) DEFAULT ('') NOT NULL , - [album_sort_dir] [varchar] (8) DEFAULT ('') NOT NULL , - [display_in_rrc] [int] DEFAULT (1) NOT NULL , - [display_on_index] [int] DEFAULT (1) NOT NULL , - [display_subalbum_list] [int] DEFAULT (1) NOT NULL , - [album_feed] [int] DEFAULT (1) NOT NULL , - [album_auth_access] [int] DEFAULT (0) NOT NULL -) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] -GO - -ALTER TABLE [phpbb_gallery_albums] WITH NOCHECK ADD - CONSTRAINT [PK_phpbb_gallery_albums] PRIMARY KEY CLUSTERED - ( - [album_id] - ) ON [PRIMARY] -GO - - -/* - Table: 'phpbb_gallery_albums_track' -*/ -CREATE TABLE [phpbb_gallery_albums_track] ( - [user_id] [int] DEFAULT (0) NOT NULL , - [album_id] [int] DEFAULT (0) NOT NULL , - [mark_time] [int] DEFAULT (0) NOT NULL -) ON [PRIMARY] -GO - -ALTER TABLE [phpbb_gallery_albums_track] WITH NOCHECK ADD - CONSTRAINT [PK_phpbb_gallery_albums_track] PRIMARY KEY CLUSTERED - ( - [user_id], - [album_id] - ) ON [PRIMARY] -GO - - -/* - Table: 'phpbb_gallery_comments' -*/ -CREATE TABLE [phpbb_gallery_comments] ( - [comment_id] [int] IDENTITY (1, 1) NOT NULL , - [comment_image_id] [int] NOT NULL , - [comment_user_id] [int] DEFAULT (0) NOT NULL , - [comment_username] [varchar] (255) DEFAULT ('') NOT NULL , - [comment_user_colour] [varchar] (6) DEFAULT ('') NOT NULL , - [comment_user_ip] [varchar] (40) DEFAULT ('') NOT NULL , - [comment_signature] [int] DEFAULT (0) NOT NULL , - [comment_time] [int] DEFAULT (0) NOT NULL , - [comment] [text] DEFAULT ('') NOT NULL , - [comment_uid] [varchar] (8) DEFAULT ('') NOT NULL , - [comment_bitfield] [varchar] (255) DEFAULT ('') NOT NULL , - [comment_edit_time] [int] DEFAULT (0) NOT NULL , - [comment_edit_count] [int] DEFAULT (0) NOT NULL , - [comment_edit_user_id] [int] DEFAULT (0) NOT NULL -) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] -GO - -ALTER TABLE [phpbb_gallery_comments] WITH NOCHECK ADD - CONSTRAINT [PK_phpbb_gallery_comments] PRIMARY KEY CLUSTERED - ( - [comment_id] - ) ON [PRIMARY] -GO - -CREATE INDEX [id] ON [phpbb_gallery_comments]([comment_image_id]) ON [PRIMARY] -GO - -CREATE INDEX [uid] ON [phpbb_gallery_comments]([comment_user_id]) ON [PRIMARY] -GO - -CREATE INDEX [ip] ON [phpbb_gallery_comments]([comment_user_ip]) ON [PRIMARY] -GO - -CREATE INDEX [time] ON [phpbb_gallery_comments]([comment_time]) ON [PRIMARY] -GO - - -/* - Table: 'phpbb_gallery_contests' -*/ -CREATE TABLE [phpbb_gallery_contests] ( - [contest_id] [int] IDENTITY (1, 1) NOT NULL , - [contest_album_id] [int] DEFAULT (0) NOT NULL , - [contest_start] [int] DEFAULT (0) NOT NULL , - [contest_rating] [int] DEFAULT (0) NOT NULL , - [contest_end] [int] DEFAULT (0) NOT NULL , - [contest_marked] [int] DEFAULT (0) NOT NULL , - [contest_first] [int] DEFAULT (0) NOT NULL , - [contest_second] [int] DEFAULT (0) NOT NULL , - [contest_third] [int] DEFAULT (0) NOT NULL -) ON [PRIMARY] -GO - -ALTER TABLE [phpbb_gallery_contests] WITH NOCHECK ADD - CONSTRAINT [PK_phpbb_gallery_contests] PRIMARY KEY CLUSTERED - ( - [contest_id] - ) ON [PRIMARY] -GO - - -/* - Table: 'phpbb_gallery_favorites' -*/ -CREATE TABLE [phpbb_gallery_favorites] ( - [favorite_id] [int] IDENTITY (1, 1) NOT NULL , - [user_id] [int] DEFAULT (0) NOT NULL , - [image_id] [int] DEFAULT (0) NOT NULL -) ON [PRIMARY] -GO - -ALTER TABLE [phpbb_gallery_favorites] WITH NOCHECK ADD - CONSTRAINT [PK_phpbb_gallery_favorites] PRIMARY KEY CLUSTERED - ( - [favorite_id] - ) ON [PRIMARY] -GO - -CREATE INDEX [uid] ON [phpbb_gallery_favorites]([user_id]) ON [PRIMARY] -GO - -CREATE INDEX [id] ON [phpbb_gallery_favorites]([image_id]) ON [PRIMARY] -GO - - -/* - Table: 'phpbb_gallery_images' -*/ -CREATE TABLE [phpbb_gallery_images] ( - [image_id] [int] IDENTITY (1, 1) NOT NULL , - [image_filename] [varchar] (255) DEFAULT ('') NOT NULL , - [image_name] [varchar] (255) DEFAULT ('') NOT NULL , - [image_name_clean] [varchar] (255) DEFAULT ('') NOT NULL , - [image_desc] [text] DEFAULT ('') NOT NULL , - [image_desc_uid] [varchar] (8) DEFAULT ('') NOT NULL , - [image_desc_bitfield] [varchar] (255) DEFAULT ('') NOT NULL , - [image_user_id] [int] DEFAULT (0) NOT NULL , - [image_username] [varchar] (255) DEFAULT ('') NOT NULL , - [image_username_clean] [varchar] (255) DEFAULT ('') NOT NULL , - [image_user_colour] [varchar] (6) DEFAULT ('') NOT NULL , - [image_user_ip] [varchar] (40) DEFAULT ('') NOT NULL , - [image_time] [int] DEFAULT (0) NOT NULL , - [image_album_id] [int] DEFAULT (0) NOT NULL , - [image_view_count] [int] DEFAULT (0) NOT NULL , - [image_status] [int] DEFAULT (0) NOT NULL , - [image_contest] [int] DEFAULT (0) NOT NULL , - [image_contest_end] [int] DEFAULT (0) NOT NULL , - [image_contest_rank] [int] DEFAULT (0) NOT NULL , - [image_filemissing] [int] DEFAULT (0) NOT NULL , - [image_has_exif] [int] DEFAULT (2) NOT NULL , - [image_exif_data] [varchar] (8000) DEFAULT ('') NOT NULL , - [image_rates] [int] DEFAULT (0) NOT NULL , - [image_rate_points] [int] DEFAULT (0) NOT NULL , - [image_rate_avg] [int] DEFAULT (0) NOT NULL , - [image_comments] [int] DEFAULT (0) NOT NULL , - [image_last_comment] [int] DEFAULT (0) NOT NULL , - [image_allow_comments] [int] DEFAULT (1) NOT NULL , - [image_favorited] [int] DEFAULT (0) NOT NULL , - [image_reported] [int] DEFAULT (0) NOT NULL , - [filesize_upload] [int] DEFAULT (0) NOT NULL , - [filesize_medium] [int] DEFAULT (0) NOT NULL , - [filesize_cache] [int] DEFAULT (0) NOT NULL -) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] -GO - -ALTER TABLE [phpbb_gallery_images] WITH NOCHECK ADD - CONSTRAINT [PK_phpbb_gallery_images] PRIMARY KEY CLUSTERED - ( - [image_id] - ) ON [PRIMARY] -GO - -CREATE INDEX [aid] ON [phpbb_gallery_images]([image_album_id]) ON [PRIMARY] -GO - -CREATE INDEX [uid] ON [phpbb_gallery_images]([image_user_id]) ON [PRIMARY] -GO - -CREATE INDEX [time] ON [phpbb_gallery_images]([image_time]) ON [PRIMARY] -GO - - -/* - Table: 'phpbb_gallery_modscache' -*/ -CREATE TABLE [phpbb_gallery_modscache] ( - [album_id] [int] DEFAULT (0) NOT NULL , - [user_id] [int] DEFAULT (0) NOT NULL , - [username] [varchar] (255) DEFAULT ('') NOT NULL , - [group_id] [int] DEFAULT (0) NOT NULL , - [group_name] [varchar] (255) DEFAULT ('') NOT NULL , - [display_on_index] [int] DEFAULT (1) NOT NULL -) ON [PRIMARY] -GO - -CREATE INDEX [doi] ON [phpbb_gallery_modscache]([display_on_index]) ON [PRIMARY] -GO - -CREATE INDEX [aid] ON [phpbb_gallery_modscache]([album_id]) ON [PRIMARY] -GO - - -/* - Table: 'phpbb_gallery_permissions' -*/ -CREATE TABLE [phpbb_gallery_permissions] ( - [perm_id] [int] IDENTITY (1, 1) NOT NULL , - [perm_role_id] [int] DEFAULT (0) NOT NULL , - [perm_album_id] [int] DEFAULT (0) NOT NULL , - [perm_user_id] [int] DEFAULT (0) NOT NULL , - [perm_group_id] [int] DEFAULT (0) NOT NULL , - [perm_system] [int] DEFAULT (0) NOT NULL -) ON [PRIMARY] -GO - -ALTER TABLE [phpbb_gallery_permissions] WITH NOCHECK ADD - CONSTRAINT [PK_phpbb_gallery_permissions] PRIMARY KEY CLUSTERED - ( - [perm_id] - ) ON [PRIMARY] -GO - - -/* - Table: 'phpbb_gallery_rates' -*/ -CREATE TABLE [phpbb_gallery_rates] ( - [rate_image_id] [int] DEFAULT (0) NOT NULL , - [rate_user_id] [int] DEFAULT (0) NOT NULL , - [rate_user_ip] [varchar] (40) DEFAULT ('') NOT NULL , - [rate_point] [int] DEFAULT (0) NOT NULL -) ON [PRIMARY] -GO - -ALTER TABLE [phpbb_gallery_rates] WITH NOCHECK ADD - CONSTRAINT [PK_phpbb_gallery_rates] PRIMARY KEY CLUSTERED - ( - [rate_image_id], - [rate_user_id] - ) ON [PRIMARY] -GO - - -/* - Table: 'phpbb_gallery_reports' -*/ -CREATE TABLE [phpbb_gallery_reports] ( - [report_id] [int] IDENTITY (1, 1) NOT NULL , - [report_album_id] [int] DEFAULT (0) NOT NULL , - [report_image_id] [int] DEFAULT (0) NOT NULL , - [reporter_id] [int] DEFAULT (0) NOT NULL , - [report_manager] [int] DEFAULT (0) NOT NULL , - [report_note] [text] DEFAULT ('') NOT NULL , - [report_time] [int] DEFAULT (0) NOT NULL , - [report_status] [int] DEFAULT (0) NOT NULL -) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] -GO - -ALTER TABLE [phpbb_gallery_reports] WITH NOCHECK ADD - CONSTRAINT [PK_phpbb_gallery_reports] PRIMARY KEY CLUSTERED - ( - [report_id] - ) ON [PRIMARY] -GO - - -/* - Table: 'phpbb_gallery_roles' -*/ -CREATE TABLE [phpbb_gallery_roles] ( - [role_id] [int] IDENTITY (1, 1) NOT NULL , - [a_list] [int] DEFAULT (0) NOT NULL , - [i_view] [int] DEFAULT (0) NOT NULL , - [i_watermark] [int] DEFAULT (0) NOT NULL , - [i_upload] [int] DEFAULT (0) NOT NULL , - [i_edit] [int] DEFAULT (0) NOT NULL , - [i_delete] [int] DEFAULT (0) NOT NULL , - [i_rate] [int] DEFAULT (0) NOT NULL , - [i_approve] [int] DEFAULT (0) NOT NULL , - [i_lock] [int] DEFAULT (0) NOT NULL , - [i_report] [int] DEFAULT (0) NOT NULL , - [i_count] [int] DEFAULT (0) NOT NULL , - [i_unlimited] [int] DEFAULT (0) NOT NULL , - [c_read] [int] DEFAULT (0) NOT NULL , - [c_post] [int] DEFAULT (0) NOT NULL , - [c_edit] [int] DEFAULT (0) NOT NULL , - [c_delete] [int] DEFAULT (0) NOT NULL , - [m_comments] [int] DEFAULT (0) NOT NULL , - [m_delete] [int] DEFAULT (0) NOT NULL , - [m_edit] [int] DEFAULT (0) NOT NULL , - [m_move] [int] DEFAULT (0) NOT NULL , - [m_report] [int] DEFAULT (0) NOT NULL , - [m_status] [int] DEFAULT (0) NOT NULL , - [a_count] [int] DEFAULT (0) NOT NULL , - [a_unlimited] [int] DEFAULT (0) NOT NULL , - [a_restrict] [int] DEFAULT (0) NOT NULL -) ON [PRIMARY] -GO - -ALTER TABLE [phpbb_gallery_roles] WITH NOCHECK ADD - CONSTRAINT [PK_phpbb_gallery_roles] PRIMARY KEY CLUSTERED - ( - [role_id] - ) ON [PRIMARY] -GO - - -/* - Table: 'phpbb_gallery_users' -*/ -CREATE TABLE [phpbb_gallery_users] ( - [user_id] [int] DEFAULT (0) NOT NULL , - [watch_own] [int] DEFAULT (0) NOT NULL , - [watch_favo] [int] DEFAULT (0) NOT NULL , - [watch_com] [int] DEFAULT (0) NOT NULL , - [user_images] [int] DEFAULT (0) NOT NULL , - [personal_album_id] [int] DEFAULT (0) NOT NULL , - [user_lastmark] [int] DEFAULT (0) NOT NULL , - [user_last_update] [int] DEFAULT (0) NOT NULL , - [user_viewexif] [int] DEFAULT (0) NOT NULL , - [user_permissions] [text] DEFAULT ('') NOT NULL , - [user_permissions_changed] [int] DEFAULT (0) NOT NULL , - [user_allow_comments] [int] DEFAULT (1) NOT NULL , - [subscribe_pegas] [int] DEFAULT (0) NOT NULL -) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] -GO - -ALTER TABLE [phpbb_gallery_users] WITH NOCHECK ADD - CONSTRAINT [PK_phpbb_gallery_users] PRIMARY KEY CLUSTERED - ( - [user_id] - ) ON [PRIMARY] -GO - -CREATE INDEX [pega] ON [phpbb_gallery_users]([personal_album_id]) ON [PRIMARY] -GO - - -/* - Table: 'phpbb_gallery_watch' -*/ -CREATE TABLE [phpbb_gallery_watch] ( - [watch_id] [int] IDENTITY (1, 1) NOT NULL , - [album_id] [int] DEFAULT (0) NOT NULL , - [image_id] [int] DEFAULT (0) NOT NULL , - [user_id] [int] DEFAULT (0) NOT NULL -) ON [PRIMARY] -GO - -ALTER TABLE [phpbb_gallery_watch] WITH NOCHECK ADD - CONSTRAINT [PK_phpbb_gallery_watch] PRIMARY KEY CLUSTERED - ( - [watch_id] - ) ON [PRIMARY] -GO - -CREATE INDEX [uid] ON [phpbb_gallery_watch]([user_id]) ON [PRIMARY] -GO - -CREATE INDEX [id] ON [phpbb_gallery_watch]([image_id]) ON [PRIMARY] -GO - -CREATE INDEX [aid] ON [phpbb_gallery_watch]([album_id]) ON [PRIMARY] -GO - - diff --git a/tests/schemas/mysql_40_schema.sql b/tests/schemas/mysql_40_schema.sql index f34386c7..80cd22b3 100644 --- a/tests/schemas/mysql_40_schema.sql +++ b/tests/schemas/mysql_40_schema.sql @@ -246,7 +246,7 @@ CREATE TABLE phpbb_forums ( forum_desc_options int(11) UNSIGNED DEFAULT '7' NOT NULL, forum_desc_uid varbinary(8) DEFAULT '' NOT NULL, forum_link blob NOT NULL, - forum_password varbinary(120) DEFAULT '' NOT NULL, + forum_password blob NOT NULL, forum_style mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, forum_image varbinary(255) DEFAULT '' NOT NULL, forum_rules blob NOT NULL, @@ -381,8 +381,6 @@ CREATE TABLE phpbb_log ( log_time int(11) UNSIGNED DEFAULT '0' NOT NULL, log_operation blob NOT NULL, log_data mediumblob NOT NULL, - album_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - image_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, PRIMARY KEY (log_id), KEY log_type (log_type), KEY log_time (log_time), @@ -524,6 +522,30 @@ CREATE TABLE phpbb_poll_votes ( ); +# Table: 'phpbb_portal_modules' +CREATE TABLE phpbb_portal_modules ( + module_id int(3) UNSIGNED NOT NULL auto_increment, + module_classname varbinary(64) DEFAULT '' NOT NULL, + module_column tinyint(3) DEFAULT '0' NOT NULL, + module_order tinyint(3) DEFAULT '0' NOT NULL, + module_name varbinary(255) DEFAULT '' NOT NULL, + module_image_src varbinary(255) DEFAULT '' NOT NULL, + module_image_width int(3) DEFAULT '0' NOT NULL, + module_image_height int(3) DEFAULT '0' NOT NULL, + module_group_ids varbinary(255) DEFAULT '' NOT NULL, + module_status tinyint(1) DEFAULT '1' NOT NULL, + PRIMARY KEY (module_id) +); + + +# Table: 'phpbb_portal_config' +CREATE TABLE phpbb_portal_config ( + config_name varbinary(255) DEFAULT '' NOT NULL, + config_value mediumblob NOT NULL, + PRIMARY KEY (config_name) +); + + # Table: 'phpbb_posts' CREATE TABLE phpbb_posts ( post_id mediumint(8) UNSIGNED NOT NULL auto_increment, @@ -647,7 +669,7 @@ CREATE TABLE phpbb_privmsgs_to ( CREATE TABLE phpbb_profile_fields ( field_id mediumint(8) UNSIGNED NOT NULL auto_increment, field_name blob NOT NULL, - field_type tinyint(4) DEFAULT '0' NOT NULL, + field_type varbinary(100) DEFAULT '' NOT NULL, field_ident varbinary(20) DEFAULT '' NOT NULL, field_length varbinary(20) DEFAULT '' NOT NULL, field_minlen varbinary(255) DEFAULT '' NOT NULL, @@ -683,7 +705,7 @@ CREATE TABLE phpbb_profile_fields_lang ( field_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, lang_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, option_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - field_type tinyint(4) DEFAULT '0' NOT NULL, + field_type varbinary(100) DEFAULT '' NOT NULL, lang_value blob NOT NULL, PRIMARY KEY (field_id, lang_id, option_id) ); @@ -792,12 +814,10 @@ CREATE TABLE phpbb_sessions ( session_viewonline tinyint(1) UNSIGNED DEFAULT '1' NOT NULL, session_autologin tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, session_admin tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, - session_album_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, PRIMARY KEY (session_id), KEY session_time (session_time), KEY session_user_id (session_user_id), - KEY session_fid (session_forum_id), - KEY session_aid (session_album_id) + KEY session_fid (session_forum_id) ); @@ -978,7 +998,7 @@ CREATE TABLE phpbb_users ( user_regdate int(11) UNSIGNED DEFAULT '0' NOT NULL, username blob NOT NULL, username_clean blob NOT NULL, - user_password varbinary(120) DEFAULT '' NOT NULL, + user_password blob NOT NULL, user_passchg int(11) UNSIGNED DEFAULT '0' NOT NULL, user_pass_convert tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, user_email blob NOT NULL, @@ -1082,255 +1102,3 @@ CREATE TABLE phpbb_zebra ( ); -# Table: 'phpbb_gallery_albums' -CREATE TABLE phpbb_gallery_albums ( - album_id mediumint(8) UNSIGNED NOT NULL auto_increment, - parent_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - left_id mediumint(8) UNSIGNED DEFAULT '1' NOT NULL, - right_id mediumint(8) UNSIGNED DEFAULT '2' NOT NULL, - album_parents mediumblob NOT NULL, - album_type int(3) UNSIGNED DEFAULT '1' NOT NULL, - album_status int(1) UNSIGNED DEFAULT '1' NOT NULL, - album_contest mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - album_name varbinary(255) DEFAULT '' NOT NULL, - album_desc mediumblob NOT NULL, - album_desc_options int(3) UNSIGNED DEFAULT '7' NOT NULL, - album_desc_uid varbinary(8) DEFAULT '' NOT NULL, - album_desc_bitfield varbinary(255) DEFAULT '' NOT NULL, - album_user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - album_images mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - album_images_real mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - album_last_image_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - album_image varbinary(255) DEFAULT '' NOT NULL, - album_last_image_time int(11) DEFAULT '0' NOT NULL, - album_last_image_name varbinary(255) DEFAULT '' NOT NULL, - album_last_username varbinary(255) DEFAULT '' NOT NULL, - album_last_user_colour varbinary(6) DEFAULT '' NOT NULL, - album_last_user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - album_watermark int(1) UNSIGNED DEFAULT '1' NOT NULL, - album_sort_key varbinary(8) DEFAULT '' NOT NULL, - album_sort_dir varbinary(8) DEFAULT '' NOT NULL, - display_in_rrc int(1) UNSIGNED DEFAULT '1' NOT NULL, - display_on_index int(1) UNSIGNED DEFAULT '1' NOT NULL, - display_subalbum_list int(1) UNSIGNED DEFAULT '1' NOT NULL, - album_feed tinyint(1) UNSIGNED DEFAULT '1' NOT NULL, - album_auth_access tinyint(1) DEFAULT '0' NOT NULL, - PRIMARY KEY (album_id) -); - - -# Table: 'phpbb_gallery_albums_track' -CREATE TABLE phpbb_gallery_albums_track ( - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - album_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - mark_time int(11) UNSIGNED DEFAULT '0' NOT NULL, - PRIMARY KEY (user_id, album_id) -); - - -# Table: 'phpbb_gallery_comments' -CREATE TABLE phpbb_gallery_comments ( - comment_id mediumint(8) UNSIGNED NOT NULL auto_increment, - comment_image_id mediumint(8) UNSIGNED NOT NULL, - comment_user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - comment_username varbinary(255) DEFAULT '' NOT NULL, - comment_user_colour varbinary(6) DEFAULT '' NOT NULL, - comment_user_ip varbinary(40) DEFAULT '' NOT NULL, - comment_signature tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, - comment_time int(11) UNSIGNED DEFAULT '0' NOT NULL, - comment mediumblob NOT NULL, - comment_uid varbinary(8) DEFAULT '' NOT NULL, - comment_bitfield varbinary(255) DEFAULT '' NOT NULL, - comment_edit_time int(11) UNSIGNED DEFAULT '0' NOT NULL, - comment_edit_count smallint(4) UNSIGNED DEFAULT '0' NOT NULL, - comment_edit_user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - PRIMARY KEY (comment_id), - KEY id (comment_image_id), - KEY uid (comment_user_id), - KEY ip (comment_user_ip), - KEY time (comment_time) -); - - -# Table: 'phpbb_gallery_contests' -CREATE TABLE phpbb_gallery_contests ( - contest_id mediumint(8) UNSIGNED NOT NULL auto_increment, - contest_album_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - contest_start int(11) UNSIGNED DEFAULT '0' NOT NULL, - contest_rating int(11) UNSIGNED DEFAULT '0' NOT NULL, - contest_end int(11) UNSIGNED DEFAULT '0' NOT NULL, - contest_marked tinyint(1) DEFAULT '0' NOT NULL, - contest_first mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - contest_second mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - contest_third mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - PRIMARY KEY (contest_id) -); - - -# Table: 'phpbb_gallery_favorites' -CREATE TABLE phpbb_gallery_favorites ( - favorite_id mediumint(8) UNSIGNED NOT NULL auto_increment, - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - image_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - PRIMARY KEY (favorite_id), - KEY uid (user_id), - KEY id (image_id) -); - - -# Table: 'phpbb_gallery_images' -CREATE TABLE phpbb_gallery_images ( - image_id mediumint(8) UNSIGNED NOT NULL auto_increment, - image_filename varbinary(255) DEFAULT '' NOT NULL, - image_name varbinary(255) DEFAULT '' NOT NULL, - image_name_clean varbinary(255) DEFAULT '' NOT NULL, - image_desc mediumblob NOT NULL, - image_desc_uid varbinary(8) DEFAULT '' NOT NULL, - image_desc_bitfield varbinary(255) DEFAULT '' NOT NULL, - image_user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - image_username varbinary(255) DEFAULT '' NOT NULL, - image_username_clean varbinary(255) DEFAULT '' NOT NULL, - image_user_colour varbinary(6) DEFAULT '' NOT NULL, - image_user_ip varbinary(40) DEFAULT '' NOT NULL, - image_time int(11) UNSIGNED DEFAULT '0' NOT NULL, - image_album_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - image_view_count int(11) UNSIGNED DEFAULT '0' NOT NULL, - image_status int(3) UNSIGNED DEFAULT '0' NOT NULL, - image_contest int(1) UNSIGNED DEFAULT '0' NOT NULL, - image_contest_end int(11) UNSIGNED DEFAULT '0' NOT NULL, - image_contest_rank int(3) UNSIGNED DEFAULT '0' NOT NULL, - image_filemissing int(3) UNSIGNED DEFAULT '0' NOT NULL, - image_has_exif int(3) UNSIGNED DEFAULT '2' NOT NULL, - image_exif_data blob NOT NULL, - image_rates mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - image_rate_points mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - image_rate_avg mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - image_comments mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - image_last_comment mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - image_allow_comments tinyint(1) DEFAULT '1' NOT NULL, - image_favorited mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - image_reported mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - filesize_upload int(20) UNSIGNED DEFAULT '0' NOT NULL, - filesize_medium int(20) UNSIGNED DEFAULT '0' NOT NULL, - filesize_cache int(20) UNSIGNED DEFAULT '0' NOT NULL, - PRIMARY KEY (image_id), - KEY aid (image_album_id), - KEY uid (image_user_id), - KEY time (image_time) -); - - -# Table: 'phpbb_gallery_modscache' -CREATE TABLE phpbb_gallery_modscache ( - album_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - username varbinary(255) DEFAULT '' NOT NULL, - group_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - group_name varbinary(255) DEFAULT '' NOT NULL, - display_on_index tinyint(1) DEFAULT '1' NOT NULL, - KEY doi (display_on_index), - KEY aid (album_id) -); - - -# Table: 'phpbb_gallery_permissions' -CREATE TABLE phpbb_gallery_permissions ( - perm_id mediumint(8) UNSIGNED NOT NULL auto_increment, - perm_role_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - perm_album_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - perm_user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - perm_group_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - perm_system int(3) DEFAULT '0' NOT NULL, - PRIMARY KEY (perm_id) -); - - -# Table: 'phpbb_gallery_rates' -CREATE TABLE phpbb_gallery_rates ( - rate_image_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - rate_user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - rate_user_ip varbinary(40) DEFAULT '' NOT NULL, - rate_point int(3) UNSIGNED DEFAULT '0' NOT NULL, - PRIMARY KEY (rate_image_id, rate_user_id) -); - - -# Table: 'phpbb_gallery_reports' -CREATE TABLE phpbb_gallery_reports ( - report_id mediumint(8) UNSIGNED NOT NULL auto_increment, - report_album_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - report_image_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - reporter_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - report_manager mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - report_note mediumblob NOT NULL, - report_time int(11) UNSIGNED DEFAULT '0' NOT NULL, - report_status int(3) UNSIGNED DEFAULT '0' NOT NULL, - PRIMARY KEY (report_id) -); - - -# Table: 'phpbb_gallery_roles' -CREATE TABLE phpbb_gallery_roles ( - role_id mediumint(8) UNSIGNED NOT NULL auto_increment, - a_list int(3) UNSIGNED DEFAULT '0' NOT NULL, - i_view int(3) UNSIGNED DEFAULT '0' NOT NULL, - i_watermark int(3) UNSIGNED DEFAULT '0' NOT NULL, - i_upload int(3) UNSIGNED DEFAULT '0' NOT NULL, - i_edit int(3) UNSIGNED DEFAULT '0' NOT NULL, - i_delete int(3) UNSIGNED DEFAULT '0' NOT NULL, - i_rate int(3) UNSIGNED DEFAULT '0' NOT NULL, - i_approve int(3) UNSIGNED DEFAULT '0' NOT NULL, - i_lock int(3) UNSIGNED DEFAULT '0' NOT NULL, - i_report int(3) UNSIGNED DEFAULT '0' NOT NULL, - i_count mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - i_unlimited int(3) UNSIGNED DEFAULT '0' NOT NULL, - c_read int(3) UNSIGNED DEFAULT '0' NOT NULL, - c_post int(3) UNSIGNED DEFAULT '0' NOT NULL, - c_edit int(3) UNSIGNED DEFAULT '0' NOT NULL, - c_delete int(3) UNSIGNED DEFAULT '0' NOT NULL, - m_comments int(3) UNSIGNED DEFAULT '0' NOT NULL, - m_delete int(3) UNSIGNED DEFAULT '0' NOT NULL, - m_edit int(3) UNSIGNED DEFAULT '0' NOT NULL, - m_move int(3) UNSIGNED DEFAULT '0' NOT NULL, - m_report int(3) UNSIGNED DEFAULT '0' NOT NULL, - m_status int(3) UNSIGNED DEFAULT '0' NOT NULL, - a_count mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - a_unlimited int(3) UNSIGNED DEFAULT '0' NOT NULL, - a_restrict int(3) UNSIGNED DEFAULT '0' NOT NULL, - PRIMARY KEY (role_id) -); - - -# Table: 'phpbb_gallery_users' -CREATE TABLE phpbb_gallery_users ( - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - watch_own int(3) UNSIGNED DEFAULT '0' NOT NULL, - watch_favo int(3) UNSIGNED DEFAULT '0' NOT NULL, - watch_com int(3) UNSIGNED DEFAULT '0' NOT NULL, - user_images mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - personal_album_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - user_lastmark int(11) UNSIGNED DEFAULT '0' NOT NULL, - user_last_update int(11) UNSIGNED DEFAULT '0' NOT NULL, - user_viewexif int(1) UNSIGNED DEFAULT '0' NOT NULL, - user_permissions mediumblob NOT NULL, - user_permissions_changed int(11) UNSIGNED DEFAULT '0' NOT NULL, - user_allow_comments tinyint(1) DEFAULT '1' NOT NULL, - subscribe_pegas tinyint(1) DEFAULT '0' NOT NULL, - PRIMARY KEY (user_id), - KEY pega (personal_album_id) -); - - -# Table: 'phpbb_gallery_watch' -CREATE TABLE phpbb_gallery_watch ( - watch_id mediumint(8) UNSIGNED NOT NULL auto_increment, - album_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - image_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - PRIMARY KEY (watch_id), - KEY uid (user_id), - KEY id (image_id), - KEY aid (album_id) -); - - diff --git a/tests/schemas/mysql_41_schema.sql b/tests/schemas/mysql_41_schema.sql index 41f140b1..a9e7350d 100644 --- a/tests/schemas/mysql_41_schema.sql +++ b/tests/schemas/mysql_41_schema.sql @@ -246,7 +246,7 @@ CREATE TABLE phpbb_forums ( forum_desc_options int(11) UNSIGNED DEFAULT '7' NOT NULL, forum_desc_uid varchar(8) DEFAULT '' NOT NULL, forum_link varchar(255) DEFAULT '' NOT NULL, - forum_password varchar(40) DEFAULT '' NOT NULL, + forum_password varchar(255) DEFAULT '' NOT NULL, forum_style mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, forum_image varchar(255) DEFAULT '' NOT NULL, forum_rules text NOT NULL, @@ -381,8 +381,6 @@ CREATE TABLE phpbb_log ( log_time int(11) UNSIGNED DEFAULT '0' NOT NULL, log_operation text NOT NULL, log_data mediumtext NOT NULL, - album_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - image_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, PRIMARY KEY (log_id), KEY log_type (log_type), KEY log_time (log_time), @@ -524,6 +522,30 @@ CREATE TABLE phpbb_poll_votes ( ) CHARACTER SET `utf8` COLLATE `utf8_bin`; +# Table: 'phpbb_portal_modules' +CREATE TABLE phpbb_portal_modules ( + module_id int(3) UNSIGNED NOT NULL auto_increment, + module_classname varchar(64) DEFAULT '' NOT NULL, + module_column tinyint(3) DEFAULT '0' NOT NULL, + module_order tinyint(3) DEFAULT '0' NOT NULL, + module_name varchar(255) DEFAULT '' NOT NULL, + module_image_src varchar(255) DEFAULT '' NOT NULL, + module_image_width int(3) DEFAULT '0' NOT NULL, + module_image_height int(3) DEFAULT '0' NOT NULL, + module_group_ids varchar(255) DEFAULT '' NOT NULL, + module_status tinyint(1) DEFAULT '1' NOT NULL, + PRIMARY KEY (module_id) +) CHARACTER SET `utf8` COLLATE `utf8_bin`; + + +# Table: 'phpbb_portal_config' +CREATE TABLE phpbb_portal_config ( + config_name varchar(255) DEFAULT '' NOT NULL, + config_value mediumtext NOT NULL, + PRIMARY KEY (config_name) +) CHARACTER SET `utf8` COLLATE `utf8_bin`; + + # Table: 'phpbb_posts' CREATE TABLE phpbb_posts ( post_id mediumint(8) UNSIGNED NOT NULL auto_increment, @@ -647,7 +669,7 @@ CREATE TABLE phpbb_privmsgs_to ( CREATE TABLE phpbb_profile_fields ( field_id mediumint(8) UNSIGNED NOT NULL auto_increment, field_name varchar(255) DEFAULT '' NOT NULL, - field_type tinyint(4) DEFAULT '0' NOT NULL, + field_type varchar(100) DEFAULT '' NOT NULL, field_ident varchar(20) DEFAULT '' NOT NULL, field_length varchar(20) DEFAULT '' NOT NULL, field_minlen varchar(255) DEFAULT '' NOT NULL, @@ -683,7 +705,7 @@ CREATE TABLE phpbb_profile_fields_lang ( field_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, lang_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, option_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - field_type tinyint(4) DEFAULT '0' NOT NULL, + field_type varchar(100) DEFAULT '' NOT NULL, lang_value varchar(255) DEFAULT '' NOT NULL, PRIMARY KEY (field_id, lang_id, option_id) ) CHARACTER SET `utf8` COLLATE `utf8_bin`; @@ -792,12 +814,10 @@ CREATE TABLE phpbb_sessions ( session_viewonline tinyint(1) UNSIGNED DEFAULT '1' NOT NULL, session_autologin tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, session_admin tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, - session_album_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, PRIMARY KEY (session_id), KEY session_time (session_time), KEY session_user_id (session_user_id), - KEY session_fid (session_forum_id), - KEY session_aid (session_album_id) + KEY session_fid (session_forum_id) ) CHARACTER SET `utf8` COLLATE `utf8_bin`; @@ -978,7 +998,7 @@ CREATE TABLE phpbb_users ( user_regdate int(11) UNSIGNED DEFAULT '0' NOT NULL, username varchar(255) DEFAULT '' NOT NULL, username_clean varchar(255) DEFAULT '' NOT NULL, - user_password varchar(40) DEFAULT '' NOT NULL, + user_password varchar(255) DEFAULT '' NOT NULL, user_passchg int(11) UNSIGNED DEFAULT '0' NOT NULL, user_pass_convert tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, user_email varchar(100) DEFAULT '' NOT NULL, @@ -1082,255 +1102,3 @@ CREATE TABLE phpbb_zebra ( ) CHARACTER SET `utf8` COLLATE `utf8_bin`; -# Table: 'phpbb_gallery_albums' -CREATE TABLE phpbb_gallery_albums ( - album_id mediumint(8) UNSIGNED NOT NULL auto_increment, - parent_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - left_id mediumint(8) UNSIGNED DEFAULT '1' NOT NULL, - right_id mediumint(8) UNSIGNED DEFAULT '2' NOT NULL, - album_parents mediumtext NOT NULL, - album_type int(3) UNSIGNED DEFAULT '1' NOT NULL, - album_status int(1) UNSIGNED DEFAULT '1' NOT NULL, - album_contest mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - album_name varchar(255) DEFAULT '' NOT NULL, - album_desc mediumtext NOT NULL, - album_desc_options int(3) UNSIGNED DEFAULT '7' NOT NULL, - album_desc_uid varchar(8) DEFAULT '' NOT NULL, - album_desc_bitfield varchar(255) DEFAULT '' NOT NULL, - album_user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - album_images mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - album_images_real mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - album_last_image_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - album_image varchar(255) DEFAULT '' NOT NULL, - album_last_image_time int(11) DEFAULT '0' NOT NULL, - album_last_image_name varchar(255) DEFAULT '' NOT NULL, - album_last_username varchar(255) DEFAULT '' NOT NULL, - album_last_user_colour varchar(6) DEFAULT '' NOT NULL, - album_last_user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - album_watermark int(1) UNSIGNED DEFAULT '1' NOT NULL, - album_sort_key varchar(8) DEFAULT '' NOT NULL, - album_sort_dir varchar(8) DEFAULT '' NOT NULL, - display_in_rrc int(1) UNSIGNED DEFAULT '1' NOT NULL, - display_on_index int(1) UNSIGNED DEFAULT '1' NOT NULL, - display_subalbum_list int(1) UNSIGNED DEFAULT '1' NOT NULL, - album_feed tinyint(1) UNSIGNED DEFAULT '1' NOT NULL, - album_auth_access tinyint(1) DEFAULT '0' NOT NULL, - PRIMARY KEY (album_id) -) CHARACTER SET `utf8` COLLATE `utf8_bin`; - - -# Table: 'phpbb_gallery_albums_track' -CREATE TABLE phpbb_gallery_albums_track ( - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - album_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - mark_time int(11) UNSIGNED DEFAULT '0' NOT NULL, - PRIMARY KEY (user_id, album_id) -) CHARACTER SET `utf8` COLLATE `utf8_bin`; - - -# Table: 'phpbb_gallery_comments' -CREATE TABLE phpbb_gallery_comments ( - comment_id mediumint(8) UNSIGNED NOT NULL auto_increment, - comment_image_id mediumint(8) UNSIGNED NOT NULL, - comment_user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - comment_username varchar(255) DEFAULT '' NOT NULL, - comment_user_colour varchar(6) DEFAULT '' NOT NULL, - comment_user_ip varchar(40) DEFAULT '' NOT NULL, - comment_signature tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, - comment_time int(11) UNSIGNED DEFAULT '0' NOT NULL, - comment mediumtext NOT NULL, - comment_uid varchar(8) DEFAULT '' NOT NULL, - comment_bitfield varchar(255) DEFAULT '' NOT NULL, - comment_edit_time int(11) UNSIGNED DEFAULT '0' NOT NULL, - comment_edit_count smallint(4) UNSIGNED DEFAULT '0' NOT NULL, - comment_edit_user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - PRIMARY KEY (comment_id), - KEY id (comment_image_id), - KEY uid (comment_user_id), - KEY ip (comment_user_ip), - KEY time (comment_time) -) CHARACTER SET `utf8` COLLATE `utf8_bin`; - - -# Table: 'phpbb_gallery_contests' -CREATE TABLE phpbb_gallery_contests ( - contest_id mediumint(8) UNSIGNED NOT NULL auto_increment, - contest_album_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - contest_start int(11) UNSIGNED DEFAULT '0' NOT NULL, - contest_rating int(11) UNSIGNED DEFAULT '0' NOT NULL, - contest_end int(11) UNSIGNED DEFAULT '0' NOT NULL, - contest_marked tinyint(1) DEFAULT '0' NOT NULL, - contest_first mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - contest_second mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - contest_third mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - PRIMARY KEY (contest_id) -) CHARACTER SET `utf8` COLLATE `utf8_bin`; - - -# Table: 'phpbb_gallery_favorites' -CREATE TABLE phpbb_gallery_favorites ( - favorite_id mediumint(8) UNSIGNED NOT NULL auto_increment, - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - image_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - PRIMARY KEY (favorite_id), - KEY uid (user_id), - KEY id (image_id) -) CHARACTER SET `utf8` COLLATE `utf8_bin`; - - -# Table: 'phpbb_gallery_images' -CREATE TABLE phpbb_gallery_images ( - image_id mediumint(8) UNSIGNED NOT NULL auto_increment, - image_filename varchar(255) DEFAULT '' NOT NULL, - image_name varchar(255) DEFAULT '' NOT NULL, - image_name_clean varchar(255) DEFAULT '' NOT NULL, - image_desc mediumtext NOT NULL, - image_desc_uid varchar(8) DEFAULT '' NOT NULL, - image_desc_bitfield varchar(255) DEFAULT '' NOT NULL, - image_user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - image_username varchar(255) DEFAULT '' NOT NULL, - image_username_clean varchar(255) DEFAULT '' NOT NULL, - image_user_colour varchar(6) DEFAULT '' NOT NULL, - image_user_ip varchar(40) DEFAULT '' NOT NULL, - image_time int(11) UNSIGNED DEFAULT '0' NOT NULL, - image_album_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - image_view_count int(11) UNSIGNED DEFAULT '0' NOT NULL, - image_status int(3) UNSIGNED DEFAULT '0' NOT NULL, - image_contest int(1) UNSIGNED DEFAULT '0' NOT NULL, - image_contest_end int(11) UNSIGNED DEFAULT '0' NOT NULL, - image_contest_rank int(3) UNSIGNED DEFAULT '0' NOT NULL, - image_filemissing int(3) UNSIGNED DEFAULT '0' NOT NULL, - image_has_exif int(3) UNSIGNED DEFAULT '2' NOT NULL, - image_exif_data text NOT NULL, - image_rates mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - image_rate_points mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - image_rate_avg mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - image_comments mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - image_last_comment mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - image_allow_comments tinyint(1) DEFAULT '1' NOT NULL, - image_favorited mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - image_reported mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - filesize_upload int(20) UNSIGNED DEFAULT '0' NOT NULL, - filesize_medium int(20) UNSIGNED DEFAULT '0' NOT NULL, - filesize_cache int(20) UNSIGNED DEFAULT '0' NOT NULL, - PRIMARY KEY (image_id), - KEY aid (image_album_id), - KEY uid (image_user_id), - KEY time (image_time) -) CHARACTER SET `utf8` COLLATE `utf8_bin`; - - -# Table: 'phpbb_gallery_modscache' -CREATE TABLE phpbb_gallery_modscache ( - album_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - username varchar(255) DEFAULT '' NOT NULL, - group_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - group_name varchar(255) DEFAULT '' NOT NULL, - display_on_index tinyint(1) DEFAULT '1' NOT NULL, - KEY doi (display_on_index), - KEY aid (album_id) -) CHARACTER SET `utf8` COLLATE `utf8_bin`; - - -# Table: 'phpbb_gallery_permissions' -CREATE TABLE phpbb_gallery_permissions ( - perm_id mediumint(8) UNSIGNED NOT NULL auto_increment, - perm_role_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - perm_album_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - perm_user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - perm_group_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - perm_system int(3) DEFAULT '0' NOT NULL, - PRIMARY KEY (perm_id) -) CHARACTER SET `utf8` COLLATE `utf8_bin`; - - -# Table: 'phpbb_gallery_rates' -CREATE TABLE phpbb_gallery_rates ( - rate_image_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - rate_user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - rate_user_ip varchar(40) DEFAULT '' NOT NULL, - rate_point int(3) UNSIGNED DEFAULT '0' NOT NULL, - PRIMARY KEY (rate_image_id, rate_user_id) -) CHARACTER SET `utf8` COLLATE `utf8_bin`; - - -# Table: 'phpbb_gallery_reports' -CREATE TABLE phpbb_gallery_reports ( - report_id mediumint(8) UNSIGNED NOT NULL auto_increment, - report_album_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - report_image_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - reporter_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - report_manager mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - report_note mediumtext NOT NULL, - report_time int(11) UNSIGNED DEFAULT '0' NOT NULL, - report_status int(3) UNSIGNED DEFAULT '0' NOT NULL, - PRIMARY KEY (report_id) -) CHARACTER SET `utf8` COLLATE `utf8_bin`; - - -# Table: 'phpbb_gallery_roles' -CREATE TABLE phpbb_gallery_roles ( - role_id mediumint(8) UNSIGNED NOT NULL auto_increment, - a_list int(3) UNSIGNED DEFAULT '0' NOT NULL, - i_view int(3) UNSIGNED DEFAULT '0' NOT NULL, - i_watermark int(3) UNSIGNED DEFAULT '0' NOT NULL, - i_upload int(3) UNSIGNED DEFAULT '0' NOT NULL, - i_edit int(3) UNSIGNED DEFAULT '0' NOT NULL, - i_delete int(3) UNSIGNED DEFAULT '0' NOT NULL, - i_rate int(3) UNSIGNED DEFAULT '0' NOT NULL, - i_approve int(3) UNSIGNED DEFAULT '0' NOT NULL, - i_lock int(3) UNSIGNED DEFAULT '0' NOT NULL, - i_report int(3) UNSIGNED DEFAULT '0' NOT NULL, - i_count mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - i_unlimited int(3) UNSIGNED DEFAULT '0' NOT NULL, - c_read int(3) UNSIGNED DEFAULT '0' NOT NULL, - c_post int(3) UNSIGNED DEFAULT '0' NOT NULL, - c_edit int(3) UNSIGNED DEFAULT '0' NOT NULL, - c_delete int(3) UNSIGNED DEFAULT '0' NOT NULL, - m_comments int(3) UNSIGNED DEFAULT '0' NOT NULL, - m_delete int(3) UNSIGNED DEFAULT '0' NOT NULL, - m_edit int(3) UNSIGNED DEFAULT '0' NOT NULL, - m_move int(3) UNSIGNED DEFAULT '0' NOT NULL, - m_report int(3) UNSIGNED DEFAULT '0' NOT NULL, - m_status int(3) UNSIGNED DEFAULT '0' NOT NULL, - a_count mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - a_unlimited int(3) UNSIGNED DEFAULT '0' NOT NULL, - a_restrict int(3) UNSIGNED DEFAULT '0' NOT NULL, - PRIMARY KEY (role_id) -) CHARACTER SET `utf8` COLLATE `utf8_bin`; - - -# Table: 'phpbb_gallery_users' -CREATE TABLE phpbb_gallery_users ( - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - watch_own int(3) UNSIGNED DEFAULT '0' NOT NULL, - watch_favo int(3) UNSIGNED DEFAULT '0' NOT NULL, - watch_com int(3) UNSIGNED DEFAULT '0' NOT NULL, - user_images mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - personal_album_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - user_lastmark int(11) UNSIGNED DEFAULT '0' NOT NULL, - user_last_update int(11) UNSIGNED DEFAULT '0' NOT NULL, - user_viewexif int(1) UNSIGNED DEFAULT '0' NOT NULL, - user_permissions mediumtext NOT NULL, - user_permissions_changed int(11) UNSIGNED DEFAULT '0' NOT NULL, - user_allow_comments tinyint(1) DEFAULT '1' NOT NULL, - subscribe_pegas tinyint(1) DEFAULT '0' NOT NULL, - PRIMARY KEY (user_id), - KEY pega (personal_album_id) -) CHARACTER SET `utf8` COLLATE `utf8_bin`; - - -# Table: 'phpbb_gallery_watch' -CREATE TABLE phpbb_gallery_watch ( - watch_id mediumint(8) UNSIGNED NOT NULL auto_increment, - album_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - image_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - PRIMARY KEY (watch_id), - KEY uid (user_id), - KEY id (image_id), - KEY aid (album_id) -) CHARACTER SET `utf8` COLLATE `utf8_bin`; - - diff --git a/tests/schemas/oracle_schema.sql b/tests/schemas/oracle_schema.sql index 2b24f8d1..ca475fd4 100644 --- a/tests/schemas/oracle_schema.sql +++ b/tests/schemas/oracle_schema.sql @@ -509,7 +509,7 @@ CREATE TABLE phpbb_forums ( forum_desc_options number(11) DEFAULT '7' NOT NULL, forum_desc_uid varchar2(8) DEFAULT '' , forum_link varchar2(765) DEFAULT '' , - forum_password varchar2(120) DEFAULT '' , + forum_password varchar2(765) DEFAULT '' , forum_style number(8) DEFAULT '0' NOT NULL, forum_image varchar2(255) DEFAULT '' , forum_rules clob DEFAULT '' , @@ -737,8 +737,6 @@ CREATE TABLE phpbb_log ( log_time number(11) DEFAULT '0' NOT NULL, log_operation clob DEFAULT '' , log_data clob DEFAULT '' , - album_id number(8) DEFAULT '0' NOT NULL, - image_id number(8) DEFAULT '0' NOT NULL, CONSTRAINT pk_phpbb_log PRIMARY KEY (log_id) ) / @@ -999,6 +997,52 @@ CREATE INDEX phpbb_poll_votes_vote_user_id ON phpbb_poll_votes (vote_user_id) CREATE INDEX phpbb_poll_votes_vote_user_ip ON phpbb_poll_votes (vote_user_ip) / +/* + Table: 'phpbb_portal_modules' +*/ +CREATE TABLE phpbb_portal_modules ( + module_id number(3) NOT NULL, + module_classname varchar2(64) DEFAULT '' , + module_column number(3) DEFAULT '0' NOT NULL, + module_order number(3) DEFAULT '0' NOT NULL, + module_name varchar2(255) DEFAULT '' , + module_image_src varchar2(255) DEFAULT '' , + module_image_width number(3) DEFAULT '0' NOT NULL, + module_image_height number(3) DEFAULT '0' NOT NULL, + module_group_ids varchar2(255) DEFAULT '' , + module_status number(1) DEFAULT '1' NOT NULL, + CONSTRAINT pk_phpbb_portal_modules PRIMARY KEY (module_id) +) +/ + + +CREATE SEQUENCE phpbb_portal_modules_seq +/ + +CREATE OR REPLACE TRIGGER t_phpbb_portal_modules +BEFORE INSERT ON phpbb_portal_modules +FOR EACH ROW WHEN ( + new.module_id IS NULL OR new.module_id = 0 +) +BEGIN + SELECT phpbb_portal_modules_seq.nextval + INTO :new.module_id + FROM dual; +END; +/ + + +/* + Table: 'phpbb_portal_config' +*/ +CREATE TABLE phpbb_portal_config ( + config_name varchar2(255) DEFAULT '' , + config_value clob DEFAULT '' , + CONSTRAINT pk_phpbb_portal_config PRIMARY KEY (config_name) +) +/ + + /* Table: 'phpbb_posts' */ @@ -1219,7 +1263,7 @@ CREATE INDEX phpbb_privmsgs_to_usr_flder_id ON phpbb_privmsgs_to (user_id, folde CREATE TABLE phpbb_profile_fields ( field_id number(8) NOT NULL, field_name varchar2(765) DEFAULT '' , - field_type number(4) DEFAULT '0' NOT NULL, + field_type varchar2(100) DEFAULT '' , field_ident varchar2(20) DEFAULT '' , field_length varchar2(20) DEFAULT '' , field_minlen varchar2(255) DEFAULT '' , @@ -1279,7 +1323,7 @@ CREATE TABLE phpbb_profile_fields_lang ( field_id number(8) DEFAULT '0' NOT NULL, lang_id number(8) DEFAULT '0' NOT NULL, option_id number(8) DEFAULT '0' NOT NULL, - field_type number(4) DEFAULT '0' NOT NULL, + field_type varchar2(100) DEFAULT '' , lang_value varchar2(765) DEFAULT '' , CONSTRAINT pk_phpbb_profile_fields_lang PRIMARY KEY (field_id, lang_id, option_id) ) @@ -1481,7 +1525,6 @@ CREATE TABLE phpbb_sessions ( session_viewonline number(1) DEFAULT '1' NOT NULL, session_autologin number(1) DEFAULT '0' NOT NULL, session_admin number(1) DEFAULT '0' NOT NULL, - session_album_id number(8) DEFAULT '0' NOT NULL, CONSTRAINT pk_phpbb_sessions PRIMARY KEY (session_id) ) / @@ -1492,8 +1535,6 @@ CREATE INDEX phpbb_sessions_session_user_id ON phpbb_sessions (session_user_id) / CREATE INDEX phpbb_sessions_session_fid ON phpbb_sessions (session_forum_id) / -CREATE INDEX phpbb_sessions_session_aid ON phpbb_sessions (session_album_id) -/ /* Table: 'phpbb_sessions_keys' @@ -1803,7 +1844,7 @@ CREATE TABLE phpbb_users ( user_regdate number(11) DEFAULT '0' NOT NULL, username varchar2(255) DEFAULT '' , username_clean varchar2(255) DEFAULT '' , - user_password varchar2(120) DEFAULT '' , + user_password varchar2(765) DEFAULT '' , user_passchg number(11) DEFAULT '0' NOT NULL, user_pass_convert number(1) DEFAULT '0' NOT NULL, user_email varchar2(300) DEFAULT '' , @@ -1968,453 +2009,3 @@ CREATE TABLE phpbb_zebra ( / -/* - Table: 'phpbb_gallery_albums' -*/ -CREATE TABLE phpbb_gallery_albums ( - album_id number(8) NOT NULL, - parent_id number(8) DEFAULT '0' NOT NULL, - left_id number(8) DEFAULT '1' NOT NULL, - right_id number(8) DEFAULT '2' NOT NULL, - album_parents clob DEFAULT '' , - album_type number(3) DEFAULT '1' NOT NULL, - album_status number(1) DEFAULT '1' NOT NULL, - album_contest number(8) DEFAULT '0' NOT NULL, - album_name varchar2(255) DEFAULT '' , - album_desc clob DEFAULT '' , - album_desc_options number(3) DEFAULT '7' NOT NULL, - album_desc_uid varchar2(8) DEFAULT '' , - album_desc_bitfield varchar2(255) DEFAULT '' , - album_user_id number(8) DEFAULT '0' NOT NULL, - album_images number(8) DEFAULT '0' NOT NULL, - album_images_real number(8) DEFAULT '0' NOT NULL, - album_last_image_id number(8) DEFAULT '0' NOT NULL, - album_image varchar2(255) DEFAULT '' , - album_last_image_time number(11) DEFAULT '0' NOT NULL, - album_last_image_name varchar2(255) DEFAULT '' , - album_last_username varchar2(255) DEFAULT '' , - album_last_user_colour varchar2(6) DEFAULT '' , - album_last_user_id number(8) DEFAULT '0' NOT NULL, - album_watermark number(1) DEFAULT '1' NOT NULL, - album_sort_key varchar2(8) DEFAULT '' , - album_sort_dir varchar2(8) DEFAULT '' , - display_in_rrc number(1) DEFAULT '1' NOT NULL, - display_on_index number(1) DEFAULT '1' NOT NULL, - display_subalbum_list number(1) DEFAULT '1' NOT NULL, - album_feed number(1) DEFAULT '1' NOT NULL, - album_auth_access number(1) DEFAULT '0' NOT NULL, - CONSTRAINT pk_phpbb_gallery_albums PRIMARY KEY (album_id) -) -/ - - -CREATE SEQUENCE phpbb_gallery_albums_seq -/ - -CREATE OR REPLACE TRIGGER t_phpbb_gallery_albums -BEFORE INSERT ON phpbb_gallery_albums -FOR EACH ROW WHEN ( - new.album_id IS NULL OR new.album_id = 0 -) -BEGIN - SELECT phpbb_gallery_albums_seq.nextval - INTO :new.album_id - FROM dual; -END; -/ - - -/* - Table: 'phpbb_gallery_albums_track' -*/ -CREATE TABLE phpbb_gallery_albums_track ( - user_id number(8) DEFAULT '0' NOT NULL, - album_id number(8) DEFAULT '0' NOT NULL, - mark_time number(11) DEFAULT '0' NOT NULL, - CONSTRAINT pk_phpbb_gallery_albums_track PRIMARY KEY (user_id, album_id) -) -/ - - -/* - Table: 'phpbb_gallery_comments' -*/ -CREATE TABLE phpbb_gallery_comments ( - comment_id number(8) NOT NULL, - comment_image_id number(8) NOT NULL, - comment_user_id number(8) DEFAULT '0' NOT NULL, - comment_username varchar2(255) DEFAULT '' , - comment_user_colour varchar2(6) DEFAULT '' , - comment_user_ip varchar2(40) DEFAULT '' , - comment_signature number(1) DEFAULT '0' NOT NULL, - comment_time number(11) DEFAULT '0' NOT NULL, - comment clob DEFAULT '' , - comment_uid varchar2(8) DEFAULT '' , - comment_bitfield varchar2(255) DEFAULT '' , - comment_edit_time number(11) DEFAULT '0' NOT NULL, - comment_edit_count number(4) DEFAULT '0' NOT NULL, - comment_edit_user_id number(8) DEFAULT '0' NOT NULL, - CONSTRAINT pk_phpbb_gallery_comments PRIMARY KEY (comment_id) -) -/ - -CREATE INDEX phpbb_gallery_comments_id ON phpbb_gallery_comments (comment_image_id) -/ -CREATE INDEX phpbb_gallery_comments_uid ON phpbb_gallery_comments (comment_user_id) -/ -CREATE INDEX phpbb_gallery_comments_ip ON phpbb_gallery_comments (comment_user_ip) -/ -CREATE INDEX phpbb_gallery_comments_time ON phpbb_gallery_comments (comment_time) -/ - -CREATE SEQUENCE phpbb_gallery_comments_seq -/ - -CREATE OR REPLACE TRIGGER t_phpbb_gallery_comments -BEFORE INSERT ON phpbb_gallery_comments -FOR EACH ROW WHEN ( - new.comment_id IS NULL OR new.comment_id = 0 -) -BEGIN - SELECT phpbb_gallery_comments_seq.nextval - INTO :new.comment_id - FROM dual; -END; -/ - - -/* - Table: 'phpbb_gallery_contests' -*/ -CREATE TABLE phpbb_gallery_contests ( - contest_id number(8) NOT NULL, - contest_album_id number(8) DEFAULT '0' NOT NULL, - contest_start number(11) DEFAULT '0' NOT NULL, - contest_rating number(11) DEFAULT '0' NOT NULL, - contest_end number(11) DEFAULT '0' NOT NULL, - contest_marked number(1) DEFAULT '0' NOT NULL, - contest_first number(8) DEFAULT '0' NOT NULL, - contest_second number(8) DEFAULT '0' NOT NULL, - contest_third number(8) DEFAULT '0' NOT NULL, - CONSTRAINT pk_phpbb_gallery_contests PRIMARY KEY (contest_id) -) -/ - - -CREATE SEQUENCE phpbb_gallery_contests_seq -/ - -CREATE OR REPLACE TRIGGER t_phpbb_gallery_contests -BEFORE INSERT ON phpbb_gallery_contests -FOR EACH ROW WHEN ( - new.contest_id IS NULL OR new.contest_id = 0 -) -BEGIN - SELECT phpbb_gallery_contests_seq.nextval - INTO :new.contest_id - FROM dual; -END; -/ - - -/* - Table: 'phpbb_gallery_favorites' -*/ -CREATE TABLE phpbb_gallery_favorites ( - favorite_id number(8) NOT NULL, - user_id number(8) DEFAULT '0' NOT NULL, - image_id number(8) DEFAULT '0' NOT NULL, - CONSTRAINT pk_phpbb_gallery_favorites PRIMARY KEY (favorite_id) -) -/ - -CREATE INDEX phpbb_gallery_favorites_uid ON phpbb_gallery_favorites (user_id) -/ -CREATE INDEX phpbb_gallery_favorites_id ON phpbb_gallery_favorites (image_id) -/ - -CREATE SEQUENCE phpbb_gallery_favorites_seq -/ - -CREATE OR REPLACE TRIGGER t_phpbb_gallery_favorites -BEFORE INSERT ON phpbb_gallery_favorites -FOR EACH ROW WHEN ( - new.favorite_id IS NULL OR new.favorite_id = 0 -) -BEGIN - SELECT phpbb_gallery_favorites_seq.nextval - INTO :new.favorite_id - FROM dual; -END; -/ - - -/* - Table: 'phpbb_gallery_images' -*/ -CREATE TABLE phpbb_gallery_images ( - image_id number(8) NOT NULL, - image_filename varchar2(255) DEFAULT '' , - image_name varchar2(255) DEFAULT '' , - image_name_clean varchar2(255) DEFAULT '' , - image_desc clob DEFAULT '' , - image_desc_uid varchar2(8) DEFAULT '' , - image_desc_bitfield varchar2(255) DEFAULT '' , - image_user_id number(8) DEFAULT '0' NOT NULL, - image_username varchar2(255) DEFAULT '' , - image_username_clean varchar2(255) DEFAULT '' , - image_user_colour varchar2(6) DEFAULT '' , - image_user_ip varchar2(40) DEFAULT '' , - image_time number(11) DEFAULT '0' NOT NULL, - image_album_id number(8) DEFAULT '0' NOT NULL, - image_view_count number(11) DEFAULT '0' NOT NULL, - image_status number(3) DEFAULT '0' NOT NULL, - image_contest number(1) DEFAULT '0' NOT NULL, - image_contest_end number(11) DEFAULT '0' NOT NULL, - image_contest_rank number(3) DEFAULT '0' NOT NULL, - image_filemissing number(3) DEFAULT '0' NOT NULL, - image_has_exif number(3) DEFAULT '2' NOT NULL, - image_exif_data clob DEFAULT '' , - image_rates number(8) DEFAULT '0' NOT NULL, - image_rate_points number(8) DEFAULT '0' NOT NULL, - image_rate_avg number(8) DEFAULT '0' NOT NULL, - image_comments number(8) DEFAULT '0' NOT NULL, - image_last_comment number(8) DEFAULT '0' NOT NULL, - image_allow_comments number(1) DEFAULT '1' NOT NULL, - image_favorited number(8) DEFAULT '0' NOT NULL, - image_reported number(8) DEFAULT '0' NOT NULL, - filesize_upload number(20) DEFAULT '0' NOT NULL, - filesize_medium number(20) DEFAULT '0' NOT NULL, - filesize_cache number(20) DEFAULT '0' NOT NULL, - CONSTRAINT pk_phpbb_gallery_images PRIMARY KEY (image_id) -) -/ - -CREATE INDEX phpbb_gallery_images_aid ON phpbb_gallery_images (image_album_id) -/ -CREATE INDEX phpbb_gallery_images_uid ON phpbb_gallery_images (image_user_id) -/ -CREATE INDEX phpbb_gallery_images_time ON phpbb_gallery_images (image_time) -/ - -CREATE SEQUENCE phpbb_gallery_images_seq -/ - -CREATE OR REPLACE TRIGGER t_phpbb_gallery_images -BEFORE INSERT ON phpbb_gallery_images -FOR EACH ROW WHEN ( - new.image_id IS NULL OR new.image_id = 0 -) -BEGIN - SELECT phpbb_gallery_images_seq.nextval - INTO :new.image_id - FROM dual; -END; -/ - - -/* - Table: 'phpbb_gallery_modscache' -*/ -CREATE TABLE phpbb_gallery_modscache ( - album_id number(8) DEFAULT '0' NOT NULL, - user_id number(8) DEFAULT '0' NOT NULL, - username varchar2(255) DEFAULT '' , - group_id number(8) DEFAULT '0' NOT NULL, - group_name varchar2(255) DEFAULT '' , - display_on_index number(1) DEFAULT '1' NOT NULL -) -/ - -CREATE INDEX phpbb_gallery_modscache_doi ON phpbb_gallery_modscache (display_on_index) -/ -CREATE INDEX phpbb_gallery_modscache_aid ON phpbb_gallery_modscache (album_id) -/ - -/* - Table: 'phpbb_gallery_permissions' -*/ -CREATE TABLE phpbb_gallery_permissions ( - perm_id number(8) NOT NULL, - perm_role_id number(8) DEFAULT '0' NOT NULL, - perm_album_id number(8) DEFAULT '0' NOT NULL, - perm_user_id number(8) DEFAULT '0' NOT NULL, - perm_group_id number(8) DEFAULT '0' NOT NULL, - perm_system number(3) DEFAULT '0' NOT NULL, - CONSTRAINT pk_phpbb_gallery_permissions PRIMARY KEY (perm_id) -) -/ - - -CREATE SEQUENCE phpbb_gallery_permissions_seq -/ - -CREATE OR REPLACE TRIGGER t_phpbb_gallery_permissions -BEFORE INSERT ON phpbb_gallery_permissions -FOR EACH ROW WHEN ( - new.perm_id IS NULL OR new.perm_id = 0 -) -BEGIN - SELECT phpbb_gallery_permissions_seq.nextval - INTO :new.perm_id - FROM dual; -END; -/ - - -/* - Table: 'phpbb_gallery_rates' -*/ -CREATE TABLE phpbb_gallery_rates ( - rate_image_id number(8) DEFAULT '0' NOT NULL, - rate_user_id number(8) DEFAULT '0' NOT NULL, - rate_user_ip varchar2(40) DEFAULT '' , - rate_point number(3) DEFAULT '0' NOT NULL, - CONSTRAINT pk_phpbb_gallery_rates PRIMARY KEY (rate_image_id, rate_user_id) -) -/ - - -/* - Table: 'phpbb_gallery_reports' -*/ -CREATE TABLE phpbb_gallery_reports ( - report_id number(8) NOT NULL, - report_album_id number(8) DEFAULT '0' NOT NULL, - report_image_id number(8) DEFAULT '0' NOT NULL, - reporter_id number(8) DEFAULT '0' NOT NULL, - report_manager number(8) DEFAULT '0' NOT NULL, - report_note clob DEFAULT '' , - report_time number(11) DEFAULT '0' NOT NULL, - report_status number(3) DEFAULT '0' NOT NULL, - CONSTRAINT pk_phpbb_gallery_reports PRIMARY KEY (report_id) -) -/ - - -CREATE SEQUENCE phpbb_gallery_reports_seq -/ - -CREATE OR REPLACE TRIGGER t_phpbb_gallery_reports -BEFORE INSERT ON phpbb_gallery_reports -FOR EACH ROW WHEN ( - new.report_id IS NULL OR new.report_id = 0 -) -BEGIN - SELECT phpbb_gallery_reports_seq.nextval - INTO :new.report_id - FROM dual; -END; -/ - - -/* - Table: 'phpbb_gallery_roles' -*/ -CREATE TABLE phpbb_gallery_roles ( - role_id number(8) NOT NULL, - a_list number(3) DEFAULT '0' NOT NULL, - i_view number(3) DEFAULT '0' NOT NULL, - i_watermark number(3) DEFAULT '0' NOT NULL, - i_upload number(3) DEFAULT '0' NOT NULL, - i_edit number(3) DEFAULT '0' NOT NULL, - i_delete number(3) DEFAULT '0' NOT NULL, - i_rate number(3) DEFAULT '0' NOT NULL, - i_approve number(3) DEFAULT '0' NOT NULL, - i_lock number(3) DEFAULT '0' NOT NULL, - i_report number(3) DEFAULT '0' NOT NULL, - i_count number(8) DEFAULT '0' NOT NULL, - i_unlimited number(3) DEFAULT '0' NOT NULL, - c_read number(3) DEFAULT '0' NOT NULL, - c_post number(3) DEFAULT '0' NOT NULL, - c_edit number(3) DEFAULT '0' NOT NULL, - c_delete number(3) DEFAULT '0' NOT NULL, - m_comments number(3) DEFAULT '0' NOT NULL, - m_delete number(3) DEFAULT '0' NOT NULL, - m_edit number(3) DEFAULT '0' NOT NULL, - m_move number(3) DEFAULT '0' NOT NULL, - m_report number(3) DEFAULT '0' NOT NULL, - m_status number(3) DEFAULT '0' NOT NULL, - a_count number(8) DEFAULT '0' NOT NULL, - a_unlimited number(3) DEFAULT '0' NOT NULL, - a_restrict number(3) DEFAULT '0' NOT NULL, - CONSTRAINT pk_phpbb_gallery_roles PRIMARY KEY (role_id) -) -/ - - -CREATE SEQUENCE phpbb_gallery_roles_seq -/ - -CREATE OR REPLACE TRIGGER t_phpbb_gallery_roles -BEFORE INSERT ON phpbb_gallery_roles -FOR EACH ROW WHEN ( - new.role_id IS NULL OR new.role_id = 0 -) -BEGIN - SELECT phpbb_gallery_roles_seq.nextval - INTO :new.role_id - FROM dual; -END; -/ - - -/* - Table: 'phpbb_gallery_users' -*/ -CREATE TABLE phpbb_gallery_users ( - user_id number(8) DEFAULT '0' NOT NULL, - watch_own number(3) DEFAULT '0' NOT NULL, - watch_favo number(3) DEFAULT '0' NOT NULL, - watch_com number(3) DEFAULT '0' NOT NULL, - user_images number(8) DEFAULT '0' NOT NULL, - personal_album_id number(8) DEFAULT '0' NOT NULL, - user_lastmark number(11) DEFAULT '0' NOT NULL, - user_last_update number(11) DEFAULT '0' NOT NULL, - user_viewexif number(1) DEFAULT '0' NOT NULL, - user_permissions clob DEFAULT '' , - user_permissions_changed number(11) DEFAULT '0' NOT NULL, - user_allow_comments number(1) DEFAULT '1' NOT NULL, - subscribe_pegas number(1) DEFAULT '0' NOT NULL, - CONSTRAINT pk_phpbb_gallery_users PRIMARY KEY (user_id) -) -/ - -CREATE INDEX phpbb_gallery_users_pega ON phpbb_gallery_users (personal_album_id) -/ - -/* - Table: 'phpbb_gallery_watch' -*/ -CREATE TABLE phpbb_gallery_watch ( - watch_id number(8) NOT NULL, - album_id number(8) DEFAULT '0' NOT NULL, - image_id number(8) DEFAULT '0' NOT NULL, - user_id number(8) DEFAULT '0' NOT NULL, - CONSTRAINT pk_phpbb_gallery_watch PRIMARY KEY (watch_id) -) -/ - -CREATE INDEX phpbb_gallery_watch_uid ON phpbb_gallery_watch (user_id) -/ -CREATE INDEX phpbb_gallery_watch_id ON phpbb_gallery_watch (image_id) -/ -CREATE INDEX phpbb_gallery_watch_aid ON phpbb_gallery_watch (album_id) -/ - -CREATE SEQUENCE phpbb_gallery_watch_seq -/ - -CREATE OR REPLACE TRIGGER t_phpbb_gallery_watch -BEFORE INSERT ON phpbb_gallery_watch -FOR EACH ROW WHEN ( - new.watch_id IS NULL OR new.watch_id = 0 -) -BEGIN - SELECT phpbb_gallery_watch_seq.nextval - INTO :new.watch_id - FROM dual; -END; -/ - - diff --git a/tests/schemas/postgres_schema.sql b/tests/schemas/postgres_schema.sql index 1c940534..902742b0 100644 --- a/tests/schemas/postgres_schema.sql +++ b/tests/schemas/postgres_schema.sql @@ -384,7 +384,7 @@ CREATE TABLE phpbb_forums ( forum_desc_options INT4 DEFAULT '7' NOT NULL CHECK (forum_desc_options >= 0), forum_desc_uid varchar(8) DEFAULT '' NOT NULL, forum_link varchar(255) DEFAULT '' NOT NULL, - forum_password varchar(40) DEFAULT '' NOT NULL, + forum_password varchar(255) DEFAULT '' NOT NULL, forum_style INT4 DEFAULT '0' NOT NULL CHECK (forum_style >= 0), forum_image varchar(255) DEFAULT '' NOT NULL, forum_rules varchar(4000) DEFAULT '' NOT NULL, @@ -541,8 +541,6 @@ CREATE TABLE phpbb_log ( log_time INT4 DEFAULT '0' NOT NULL CHECK (log_time >= 0), log_operation varchar(4000) DEFAULT '' NOT NULL, log_data TEXT DEFAULT '' NOT NULL, - album_id INT4 DEFAULT '0' NOT NULL CHECK (album_id >= 0), - image_id INT4 DEFAULT '0' NOT NULL CHECK (image_id >= 0), PRIMARY KEY (log_id) ); @@ -710,6 +708,36 @@ CREATE INDEX phpbb_poll_votes_topic_id ON phpbb_poll_votes (topic_id); CREATE INDEX phpbb_poll_votes_vote_user_id ON phpbb_poll_votes (vote_user_id); CREATE INDEX phpbb_poll_votes_vote_user_ip ON phpbb_poll_votes (vote_user_ip); +/* + Table: 'phpbb_portal_modules' +*/ +CREATE SEQUENCE phpbb_portal_modules_seq; + +CREATE TABLE phpbb_portal_modules ( + module_id INT4 DEFAULT nextval('phpbb_portal_modules_seq'), + module_classname varchar(64) DEFAULT '' NOT NULL, + module_column INT2 DEFAULT '0' NOT NULL, + module_order INT2 DEFAULT '0' NOT NULL, + module_name varchar(255) DEFAULT '' NOT NULL, + module_image_src varchar(255) DEFAULT '' NOT NULL, + module_image_width INT4 DEFAULT '0' NOT NULL, + module_image_height INT4 DEFAULT '0' NOT NULL, + module_group_ids varchar(255) DEFAULT '' NOT NULL, + module_status INT2 DEFAULT '1' NOT NULL, + PRIMARY KEY (module_id) +); + + +/* + Table: 'phpbb_portal_config' +*/ +CREATE TABLE phpbb_portal_config ( + config_name varchar(255) DEFAULT '' NOT NULL, + config_value TEXT DEFAULT '' NOT NULL, + PRIMARY KEY (config_name) +); + + /* Table: 'phpbb_posts' */ @@ -855,7 +883,7 @@ CREATE SEQUENCE phpbb_profile_fields_seq; CREATE TABLE phpbb_profile_fields ( field_id INT4 DEFAULT nextval('phpbb_profile_fields_seq'), field_name varchar(255) DEFAULT '' NOT NULL, - field_type INT2 DEFAULT '0' NOT NULL, + field_type varchar(100) DEFAULT '' NOT NULL, field_ident varchar(20) DEFAULT '' NOT NULL, field_length varchar(20) DEFAULT '' NOT NULL, field_minlen varchar(255) DEFAULT '' NOT NULL, @@ -895,7 +923,7 @@ CREATE TABLE phpbb_profile_fields_lang ( field_id INT4 DEFAULT '0' NOT NULL CHECK (field_id >= 0), lang_id INT4 DEFAULT '0' NOT NULL CHECK (lang_id >= 0), option_id INT4 DEFAULT '0' NOT NULL CHECK (option_id >= 0), - field_type INT2 DEFAULT '0' NOT NULL, + field_type varchar(100) DEFAULT '' NOT NULL, lang_value varchar(255) DEFAULT '' NOT NULL, PRIMARY KEY (field_id, lang_id, option_id) ); @@ -1028,14 +1056,12 @@ CREATE TABLE phpbb_sessions ( session_viewonline INT2 DEFAULT '1' NOT NULL CHECK (session_viewonline >= 0), session_autologin INT2 DEFAULT '0' NOT NULL CHECK (session_autologin >= 0), session_admin INT2 DEFAULT '0' NOT NULL CHECK (session_admin >= 0), - session_album_id INT4 DEFAULT '0' NOT NULL CHECK (session_album_id >= 0), PRIMARY KEY (session_id) ); CREATE INDEX phpbb_sessions_session_time ON phpbb_sessions (session_time); CREATE INDEX phpbb_sessions_session_user_id ON phpbb_sessions (session_user_id); CREATE INDEX phpbb_sessions_session_fid ON phpbb_sessions (session_forum_id); -CREATE INDEX phpbb_sessions_session_aid ON phpbb_sessions (session_album_id); /* Table: 'phpbb_sessions_keys' @@ -1250,7 +1276,7 @@ CREATE TABLE phpbb_users ( user_regdate INT4 DEFAULT '0' NOT NULL CHECK (user_regdate >= 0), username varchar_ci DEFAULT '' NOT NULL, username_clean varchar_ci DEFAULT '' NOT NULL, - user_password varchar(40) DEFAULT '' NOT NULL, + user_password varchar(255) DEFAULT '' NOT NULL, user_passchg INT4 DEFAULT '0' NOT NULL CHECK (user_passchg >= 0), user_pass_convert INT2 DEFAULT '0' NOT NULL CHECK (user_pass_convert >= 0), user_email varchar(100) DEFAULT '' NOT NULL, @@ -1364,301 +1390,5 @@ CREATE TABLE phpbb_zebra ( ); -/* - Table: 'phpbb_gallery_albums' -*/ -CREATE SEQUENCE phpbb_gallery_albums_seq; - -CREATE TABLE phpbb_gallery_albums ( - album_id INT4 DEFAULT nextval('phpbb_gallery_albums_seq'), - parent_id INT4 DEFAULT '0' NOT NULL CHECK (parent_id >= 0), - left_id INT4 DEFAULT '1' NOT NULL CHECK (left_id >= 0), - right_id INT4 DEFAULT '2' NOT NULL CHECK (right_id >= 0), - album_parents TEXT DEFAULT '' NOT NULL, - album_type INT4 DEFAULT '1' NOT NULL CHECK (album_type >= 0), - album_status INT4 DEFAULT '1' NOT NULL CHECK (album_status >= 0), - album_contest INT4 DEFAULT '0' NOT NULL CHECK (album_contest >= 0), - album_name varchar(255) DEFAULT '' NOT NULL, - album_desc TEXT DEFAULT '' NOT NULL, - album_desc_options INT4 DEFAULT '7' NOT NULL CHECK (album_desc_options >= 0), - album_desc_uid varchar(8) DEFAULT '' NOT NULL, - album_desc_bitfield varchar(255) DEFAULT '' NOT NULL, - album_user_id INT4 DEFAULT '0' NOT NULL CHECK (album_user_id >= 0), - album_images INT4 DEFAULT '0' NOT NULL CHECK (album_images >= 0), - album_images_real INT4 DEFAULT '0' NOT NULL CHECK (album_images_real >= 0), - album_last_image_id INT4 DEFAULT '0' NOT NULL CHECK (album_last_image_id >= 0), - album_image varchar(255) DEFAULT '' NOT NULL, - album_last_image_time INT4 DEFAULT '0' NOT NULL, - album_last_image_name varchar(255) DEFAULT '' NOT NULL, - album_last_username varchar(255) DEFAULT '' NOT NULL, - album_last_user_colour varchar(6) DEFAULT '' NOT NULL, - album_last_user_id INT4 DEFAULT '0' NOT NULL CHECK (album_last_user_id >= 0), - album_watermark INT4 DEFAULT '1' NOT NULL CHECK (album_watermark >= 0), - album_sort_key varchar(8) DEFAULT '' NOT NULL, - album_sort_dir varchar(8) DEFAULT '' NOT NULL, - display_in_rrc INT4 DEFAULT '1' NOT NULL CHECK (display_in_rrc >= 0), - display_on_index INT4 DEFAULT '1' NOT NULL CHECK (display_on_index >= 0), - display_subalbum_list INT4 DEFAULT '1' NOT NULL CHECK (display_subalbum_list >= 0), - album_feed INT2 DEFAULT '1' NOT NULL CHECK (album_feed >= 0), - album_auth_access INT2 DEFAULT '0' NOT NULL, - PRIMARY KEY (album_id) -); - - -/* - Table: 'phpbb_gallery_albums_track' -*/ -CREATE TABLE phpbb_gallery_albums_track ( - user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0), - album_id INT4 DEFAULT '0' NOT NULL CHECK (album_id >= 0), - mark_time INT4 DEFAULT '0' NOT NULL CHECK (mark_time >= 0), - PRIMARY KEY (user_id, album_id) -); - - -/* - Table: 'phpbb_gallery_comments' -*/ -CREATE SEQUENCE phpbb_gallery_comments_seq; - -CREATE TABLE phpbb_gallery_comments ( - comment_id INT4 DEFAULT nextval('phpbb_gallery_comments_seq'), - comment_image_id INT4 NOT NULL CHECK (comment_image_id >= 0), - comment_user_id INT4 DEFAULT '0' NOT NULL CHECK (comment_user_id >= 0), - comment_username varchar(255) DEFAULT '' NOT NULL, - comment_user_colour varchar(6) DEFAULT '' NOT NULL, - comment_user_ip varchar(40) DEFAULT '' NOT NULL, - comment_signature INT2 DEFAULT '0' NOT NULL CHECK (comment_signature >= 0), - comment_time INT4 DEFAULT '0' NOT NULL CHECK (comment_time >= 0), - comment TEXT DEFAULT '' NOT NULL, - comment_uid varchar(8) DEFAULT '' NOT NULL, - comment_bitfield varchar(255) DEFAULT '' NOT NULL, - comment_edit_time INT4 DEFAULT '0' NOT NULL CHECK (comment_edit_time >= 0), - comment_edit_count INT2 DEFAULT '0' NOT NULL CHECK (comment_edit_count >= 0), - comment_edit_user_id INT4 DEFAULT '0' NOT NULL CHECK (comment_edit_user_id >= 0), - PRIMARY KEY (comment_id) -); - -CREATE INDEX phpbb_gallery_comments_id ON phpbb_gallery_comments (comment_image_id); -CREATE INDEX phpbb_gallery_comments_uid ON phpbb_gallery_comments (comment_user_id); -CREATE INDEX phpbb_gallery_comments_ip ON phpbb_gallery_comments (comment_user_ip); -CREATE INDEX phpbb_gallery_comments_time ON phpbb_gallery_comments (comment_time); - -/* - Table: 'phpbb_gallery_contests' -*/ -CREATE SEQUENCE phpbb_gallery_contests_seq; - -CREATE TABLE phpbb_gallery_contests ( - contest_id INT4 DEFAULT nextval('phpbb_gallery_contests_seq'), - contest_album_id INT4 DEFAULT '0' NOT NULL CHECK (contest_album_id >= 0), - contest_start INT4 DEFAULT '0' NOT NULL CHECK (contest_start >= 0), - contest_rating INT4 DEFAULT '0' NOT NULL CHECK (contest_rating >= 0), - contest_end INT4 DEFAULT '0' NOT NULL CHECK (contest_end >= 0), - contest_marked INT2 DEFAULT '0' NOT NULL, - contest_first INT4 DEFAULT '0' NOT NULL CHECK (contest_first >= 0), - contest_second INT4 DEFAULT '0' NOT NULL CHECK (contest_second >= 0), - contest_third INT4 DEFAULT '0' NOT NULL CHECK (contest_third >= 0), - PRIMARY KEY (contest_id) -); - - -/* - Table: 'phpbb_gallery_favorites' -*/ -CREATE SEQUENCE phpbb_gallery_favorites_seq; - -CREATE TABLE phpbb_gallery_favorites ( - favorite_id INT4 DEFAULT nextval('phpbb_gallery_favorites_seq'), - user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0), - image_id INT4 DEFAULT '0' NOT NULL CHECK (image_id >= 0), - PRIMARY KEY (favorite_id) -); - -CREATE INDEX phpbb_gallery_favorites_uid ON phpbb_gallery_favorites (user_id); -CREATE INDEX phpbb_gallery_favorites_id ON phpbb_gallery_favorites (image_id); - -/* - Table: 'phpbb_gallery_images' -*/ -CREATE SEQUENCE phpbb_gallery_images_seq; - -CREATE TABLE phpbb_gallery_images ( - image_id INT4 DEFAULT nextval('phpbb_gallery_images_seq'), - image_filename varchar(255) DEFAULT '' NOT NULL, - image_name varchar(255) DEFAULT '' NOT NULL, - image_name_clean varchar(255) DEFAULT '' NOT NULL, - image_desc TEXT DEFAULT '' NOT NULL, - image_desc_uid varchar(8) DEFAULT '' NOT NULL, - image_desc_bitfield varchar(255) DEFAULT '' NOT NULL, - image_user_id INT4 DEFAULT '0' NOT NULL CHECK (image_user_id >= 0), - image_username varchar(255) DEFAULT '' NOT NULL, - image_username_clean varchar(255) DEFAULT '' NOT NULL, - image_user_colour varchar(6) DEFAULT '' NOT NULL, - image_user_ip varchar(40) DEFAULT '' NOT NULL, - image_time INT4 DEFAULT '0' NOT NULL CHECK (image_time >= 0), - image_album_id INT4 DEFAULT '0' NOT NULL CHECK (image_album_id >= 0), - image_view_count INT4 DEFAULT '0' NOT NULL CHECK (image_view_count >= 0), - image_status INT4 DEFAULT '0' NOT NULL CHECK (image_status >= 0), - image_contest INT4 DEFAULT '0' NOT NULL CHECK (image_contest >= 0), - image_contest_end INT4 DEFAULT '0' NOT NULL CHECK (image_contest_end >= 0), - image_contest_rank INT4 DEFAULT '0' NOT NULL CHECK (image_contest_rank >= 0), - image_filemissing INT4 DEFAULT '0' NOT NULL CHECK (image_filemissing >= 0), - image_has_exif INT4 DEFAULT '2' NOT NULL CHECK (image_has_exif >= 0), - image_exif_data varchar(8000) DEFAULT '' NOT NULL, - image_rates INT4 DEFAULT '0' NOT NULL CHECK (image_rates >= 0), - image_rate_points INT4 DEFAULT '0' NOT NULL CHECK (image_rate_points >= 0), - image_rate_avg INT4 DEFAULT '0' NOT NULL CHECK (image_rate_avg >= 0), - image_comments INT4 DEFAULT '0' NOT NULL CHECK (image_comments >= 0), - image_last_comment INT4 DEFAULT '0' NOT NULL CHECK (image_last_comment >= 0), - image_allow_comments INT2 DEFAULT '1' NOT NULL, - image_favorited INT4 DEFAULT '0' NOT NULL CHECK (image_favorited >= 0), - image_reported INT4 DEFAULT '0' NOT NULL CHECK (image_reported >= 0), - filesize_upload INT4 DEFAULT '0' NOT NULL CHECK (filesize_upload >= 0), - filesize_medium INT4 DEFAULT '0' NOT NULL CHECK (filesize_medium >= 0), - filesize_cache INT4 DEFAULT '0' NOT NULL CHECK (filesize_cache >= 0), - PRIMARY KEY (image_id) -); - -CREATE INDEX phpbb_gallery_images_aid ON phpbb_gallery_images (image_album_id); -CREATE INDEX phpbb_gallery_images_uid ON phpbb_gallery_images (image_user_id); -CREATE INDEX phpbb_gallery_images_time ON phpbb_gallery_images (image_time); - -/* - Table: 'phpbb_gallery_modscache' -*/ -CREATE TABLE phpbb_gallery_modscache ( - album_id INT4 DEFAULT '0' NOT NULL CHECK (album_id >= 0), - user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0), - username varchar(255) DEFAULT '' NOT NULL, - group_id INT4 DEFAULT '0' NOT NULL CHECK (group_id >= 0), - group_name varchar(255) DEFAULT '' NOT NULL, - display_on_index INT2 DEFAULT '1' NOT NULL -); - -CREATE INDEX phpbb_gallery_modscache_doi ON phpbb_gallery_modscache (display_on_index); -CREATE INDEX phpbb_gallery_modscache_aid ON phpbb_gallery_modscache (album_id); - -/* - Table: 'phpbb_gallery_permissions' -*/ -CREATE SEQUENCE phpbb_gallery_permissions_seq; - -CREATE TABLE phpbb_gallery_permissions ( - perm_id INT4 DEFAULT nextval('phpbb_gallery_permissions_seq'), - perm_role_id INT4 DEFAULT '0' NOT NULL CHECK (perm_role_id >= 0), - perm_album_id INT4 DEFAULT '0' NOT NULL CHECK (perm_album_id >= 0), - perm_user_id INT4 DEFAULT '0' NOT NULL CHECK (perm_user_id >= 0), - perm_group_id INT4 DEFAULT '0' NOT NULL CHECK (perm_group_id >= 0), - perm_system INT4 DEFAULT '0' NOT NULL, - PRIMARY KEY (perm_id) -); - - -/* - Table: 'phpbb_gallery_rates' -*/ -CREATE TABLE phpbb_gallery_rates ( - rate_image_id INT4 DEFAULT '0' NOT NULL CHECK (rate_image_id >= 0), - rate_user_id INT4 DEFAULT '0' NOT NULL CHECK (rate_user_id >= 0), - rate_user_ip varchar(40) DEFAULT '' NOT NULL, - rate_point INT4 DEFAULT '0' NOT NULL CHECK (rate_point >= 0), - PRIMARY KEY (rate_image_id, rate_user_id) -); - - -/* - Table: 'phpbb_gallery_reports' -*/ -CREATE SEQUENCE phpbb_gallery_reports_seq; - -CREATE TABLE phpbb_gallery_reports ( - report_id INT4 DEFAULT nextval('phpbb_gallery_reports_seq'), - report_album_id INT4 DEFAULT '0' NOT NULL CHECK (report_album_id >= 0), - report_image_id INT4 DEFAULT '0' NOT NULL CHECK (report_image_id >= 0), - reporter_id INT4 DEFAULT '0' NOT NULL CHECK (reporter_id >= 0), - report_manager INT4 DEFAULT '0' NOT NULL CHECK (report_manager >= 0), - report_note TEXT DEFAULT '' NOT NULL, - report_time INT4 DEFAULT '0' NOT NULL CHECK (report_time >= 0), - report_status INT4 DEFAULT '0' NOT NULL CHECK (report_status >= 0), - PRIMARY KEY (report_id) -); - - -/* - Table: 'phpbb_gallery_roles' -*/ -CREATE SEQUENCE phpbb_gallery_roles_seq; - -CREATE TABLE phpbb_gallery_roles ( - role_id INT4 DEFAULT nextval('phpbb_gallery_roles_seq'), - a_list INT4 DEFAULT '0' NOT NULL CHECK (a_list >= 0), - i_view INT4 DEFAULT '0' NOT NULL CHECK (i_view >= 0), - i_watermark INT4 DEFAULT '0' NOT NULL CHECK (i_watermark >= 0), - i_upload INT4 DEFAULT '0' NOT NULL CHECK (i_upload >= 0), - i_edit INT4 DEFAULT '0' NOT NULL CHECK (i_edit >= 0), - i_delete INT4 DEFAULT '0' NOT NULL CHECK (i_delete >= 0), - i_rate INT4 DEFAULT '0' NOT NULL CHECK (i_rate >= 0), - i_approve INT4 DEFAULT '0' NOT NULL CHECK (i_approve >= 0), - i_lock INT4 DEFAULT '0' NOT NULL CHECK (i_lock >= 0), - i_report INT4 DEFAULT '0' NOT NULL CHECK (i_report >= 0), - i_count INT4 DEFAULT '0' NOT NULL CHECK (i_count >= 0), - i_unlimited INT4 DEFAULT '0' NOT NULL CHECK (i_unlimited >= 0), - c_read INT4 DEFAULT '0' NOT NULL CHECK (c_read >= 0), - c_post INT4 DEFAULT '0' NOT NULL CHECK (c_post >= 0), - c_edit INT4 DEFAULT '0' NOT NULL CHECK (c_edit >= 0), - c_delete INT4 DEFAULT '0' NOT NULL CHECK (c_delete >= 0), - m_comments INT4 DEFAULT '0' NOT NULL CHECK (m_comments >= 0), - m_delete INT4 DEFAULT '0' NOT NULL CHECK (m_delete >= 0), - m_edit INT4 DEFAULT '0' NOT NULL CHECK (m_edit >= 0), - m_move INT4 DEFAULT '0' NOT NULL CHECK (m_move >= 0), - m_report INT4 DEFAULT '0' NOT NULL CHECK (m_report >= 0), - m_status INT4 DEFAULT '0' NOT NULL CHECK (m_status >= 0), - a_count INT4 DEFAULT '0' NOT NULL CHECK (a_count >= 0), - a_unlimited INT4 DEFAULT '0' NOT NULL CHECK (a_unlimited >= 0), - a_restrict INT4 DEFAULT '0' NOT NULL CHECK (a_restrict >= 0), - PRIMARY KEY (role_id) -); - - -/* - Table: 'phpbb_gallery_users' -*/ -CREATE TABLE phpbb_gallery_users ( - user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0), - watch_own INT4 DEFAULT '0' NOT NULL CHECK (watch_own >= 0), - watch_favo INT4 DEFAULT '0' NOT NULL CHECK (watch_favo >= 0), - watch_com INT4 DEFAULT '0' NOT NULL CHECK (watch_com >= 0), - user_images INT4 DEFAULT '0' NOT NULL CHECK (user_images >= 0), - personal_album_id INT4 DEFAULT '0' NOT NULL CHECK (personal_album_id >= 0), - user_lastmark INT4 DEFAULT '0' NOT NULL CHECK (user_lastmark >= 0), - user_last_update INT4 DEFAULT '0' NOT NULL CHECK (user_last_update >= 0), - user_viewexif INT4 DEFAULT '0' NOT NULL CHECK (user_viewexif >= 0), - user_permissions TEXT DEFAULT '' NOT NULL, - user_permissions_changed INT4 DEFAULT '0' NOT NULL CHECK (user_permissions_changed >= 0), - user_allow_comments INT2 DEFAULT '1' NOT NULL, - subscribe_pegas INT2 DEFAULT '0' NOT NULL, - PRIMARY KEY (user_id) -); - -CREATE INDEX phpbb_gallery_users_pega ON phpbb_gallery_users (personal_album_id); - -/* - Table: 'phpbb_gallery_watch' -*/ -CREATE SEQUENCE phpbb_gallery_watch_seq; - -CREATE TABLE phpbb_gallery_watch ( - watch_id INT4 DEFAULT nextval('phpbb_gallery_watch_seq'), - album_id INT4 DEFAULT '0' NOT NULL CHECK (album_id >= 0), - image_id INT4 DEFAULT '0' NOT NULL CHECK (image_id >= 0), - user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0), - PRIMARY KEY (watch_id) -); - -CREATE INDEX phpbb_gallery_watch_uid ON phpbb_gallery_watch (user_id); -CREATE INDEX phpbb_gallery_watch_id ON phpbb_gallery_watch (image_id); -CREATE INDEX phpbb_gallery_watch_aid ON phpbb_gallery_watch (album_id); - COMMIT; \ No newline at end of file diff --git a/tests/schemas/sqlite_schema.sql b/tests/schemas/sqlite_schema.sql index 44b5919a..da431618 100644 --- a/tests/schemas/sqlite_schema.sql +++ b/tests/schemas/sqlite_schema.sql @@ -239,7 +239,7 @@ CREATE TABLE phpbb_forums ( forum_desc_options INTEGER UNSIGNED NOT NULL DEFAULT '7', forum_desc_uid varchar(8) NOT NULL DEFAULT '', forum_link varchar(255) NOT NULL DEFAULT '', - forum_password varchar(40) NOT NULL DEFAULT '', + forum_password varchar(255) NOT NULL DEFAULT '', forum_style INTEGER UNSIGNED NOT NULL DEFAULT '0', forum_image varchar(255) NOT NULL DEFAULT '', forum_rules text(65535) NOT NULL DEFAULT '', @@ -369,9 +369,7 @@ CREATE TABLE phpbb_log ( log_ip varchar(40) NOT NULL DEFAULT '', log_time INTEGER UNSIGNED NOT NULL DEFAULT '0', log_operation text(65535) NOT NULL DEFAULT '', - log_data mediumtext(16777215) NOT NULL DEFAULT '', - album_id INTEGER UNSIGNED NOT NULL DEFAULT '0', - image_id INTEGER UNSIGNED NOT NULL DEFAULT '0' + log_data mediumtext(16777215) NOT NULL DEFAULT '' ); CREATE INDEX phpbb_log_log_type ON phpbb_log (log_type); @@ -509,6 +507,29 @@ CREATE INDEX phpbb_poll_votes_topic_id ON phpbb_poll_votes (topic_id); CREATE INDEX phpbb_poll_votes_vote_user_id ON phpbb_poll_votes (vote_user_id); CREATE INDEX phpbb_poll_votes_vote_user_ip ON phpbb_poll_votes (vote_user_ip); +# Table: 'phpbb_portal_modules' +CREATE TABLE phpbb_portal_modules ( + module_id INTEGER PRIMARY KEY NOT NULL , + module_classname varchar(64) NOT NULL DEFAULT '', + module_column tinyint(3) NOT NULL DEFAULT '0', + module_order tinyint(3) NOT NULL DEFAULT '0', + module_name varchar(255) NOT NULL DEFAULT '', + module_image_src varchar(255) NOT NULL DEFAULT '', + module_image_width int(3) NOT NULL DEFAULT '0', + module_image_height int(3) NOT NULL DEFAULT '0', + module_group_ids varchar(255) NOT NULL DEFAULT '', + module_status tinyint(1) NOT NULL DEFAULT '1' +); + + +# Table: 'phpbb_portal_config' +CREATE TABLE phpbb_portal_config ( + config_name varchar(255) NOT NULL DEFAULT '', + config_value mediumtext(16777215) NOT NULL DEFAULT '', + PRIMARY KEY (config_name) +); + + # Table: 'phpbb_posts' CREATE TABLE phpbb_posts ( post_id INTEGER PRIMARY KEY NOT NULL , @@ -628,7 +649,7 @@ CREATE INDEX phpbb_privmsgs_to_usr_flder_id ON phpbb_privmsgs_to (user_id, folde CREATE TABLE phpbb_profile_fields ( field_id INTEGER PRIMARY KEY NOT NULL , field_name varchar(255) NOT NULL DEFAULT '', - field_type tinyint(4) NOT NULL DEFAULT '0', + field_type varchar(100) NOT NULL DEFAULT '', field_ident varchar(20) NOT NULL DEFAULT '', field_length varchar(20) NOT NULL DEFAULT '', field_minlen varchar(255) NOT NULL DEFAULT '', @@ -663,7 +684,7 @@ CREATE TABLE phpbb_profile_fields_lang ( field_id INTEGER UNSIGNED NOT NULL DEFAULT '0', lang_id INTEGER UNSIGNED NOT NULL DEFAULT '0', option_id INTEGER UNSIGNED NOT NULL DEFAULT '0', - field_type tinyint(4) NOT NULL DEFAULT '0', + field_type varchar(100) NOT NULL DEFAULT '', lang_value varchar(255) NOT NULL DEFAULT '', PRIMARY KEY (field_id, lang_id, option_id) ); @@ -768,14 +789,12 @@ CREATE TABLE phpbb_sessions ( session_viewonline INTEGER UNSIGNED NOT NULL DEFAULT '1', session_autologin INTEGER UNSIGNED NOT NULL DEFAULT '0', session_admin INTEGER UNSIGNED NOT NULL DEFAULT '0', - session_album_id INTEGER UNSIGNED NOT NULL DEFAULT '0', PRIMARY KEY (session_id) ); CREATE INDEX phpbb_sessions_session_time ON phpbb_sessions (session_time); CREATE INDEX phpbb_sessions_session_user_id ON phpbb_sessions (session_user_id); CREATE INDEX phpbb_sessions_session_fid ON phpbb_sessions (session_forum_id); -CREATE INDEX phpbb_sessions_session_aid ON phpbb_sessions (session_album_id); # Table: 'phpbb_sessions_keys' CREATE TABLE phpbb_sessions_keys ( @@ -949,7 +968,7 @@ CREATE TABLE phpbb_users ( user_regdate INTEGER UNSIGNED NOT NULL DEFAULT '0', username varchar(255) NOT NULL DEFAULT '', username_clean varchar(255) NOT NULL DEFAULT '', - user_password varchar(40) NOT NULL DEFAULT '', + user_password varchar(255) NOT NULL DEFAULT '', user_passchg INTEGER UNSIGNED NOT NULL DEFAULT '0', user_pass_convert INTEGER UNSIGNED NOT NULL DEFAULT '0', user_email varchar(100) NOT NULL DEFAULT '', @@ -1050,248 +1069,5 @@ CREATE TABLE phpbb_zebra ( ); -# Table: 'phpbb_gallery_albums' -CREATE TABLE phpbb_gallery_albums ( - album_id INTEGER PRIMARY KEY NOT NULL , - parent_id INTEGER UNSIGNED NOT NULL DEFAULT '0', - left_id INTEGER UNSIGNED NOT NULL DEFAULT '1', - right_id INTEGER UNSIGNED NOT NULL DEFAULT '2', - album_parents mediumtext(16777215) NOT NULL DEFAULT '', - album_type INTEGER UNSIGNED NOT NULL DEFAULT '1', - album_status INTEGER UNSIGNED NOT NULL DEFAULT '1', - album_contest INTEGER UNSIGNED NOT NULL DEFAULT '0', - album_name varchar(255) NOT NULL DEFAULT '', - album_desc mediumtext(16777215) NOT NULL DEFAULT '', - album_desc_options INTEGER UNSIGNED NOT NULL DEFAULT '7', - album_desc_uid varchar(8) NOT NULL DEFAULT '', - album_desc_bitfield varchar(255) NOT NULL DEFAULT '', - album_user_id INTEGER UNSIGNED NOT NULL DEFAULT '0', - album_images INTEGER UNSIGNED NOT NULL DEFAULT '0', - album_images_real INTEGER UNSIGNED NOT NULL DEFAULT '0', - album_last_image_id INTEGER UNSIGNED NOT NULL DEFAULT '0', - album_image varchar(255) NOT NULL DEFAULT '', - album_last_image_time int(11) NOT NULL DEFAULT '0', - album_last_image_name varchar(255) NOT NULL DEFAULT '', - album_last_username varchar(255) NOT NULL DEFAULT '', - album_last_user_colour varchar(6) NOT NULL DEFAULT '', - album_last_user_id INTEGER UNSIGNED NOT NULL DEFAULT '0', - album_watermark INTEGER UNSIGNED NOT NULL DEFAULT '1', - album_sort_key varchar(8) NOT NULL DEFAULT '', - album_sort_dir varchar(8) NOT NULL DEFAULT '', - display_in_rrc INTEGER UNSIGNED NOT NULL DEFAULT '1', - display_on_index INTEGER UNSIGNED NOT NULL DEFAULT '1', - display_subalbum_list INTEGER UNSIGNED NOT NULL DEFAULT '1', - album_feed INTEGER UNSIGNED NOT NULL DEFAULT '1', - album_auth_access tinyint(1) NOT NULL DEFAULT '0' -); - - -# Table: 'phpbb_gallery_albums_track' -CREATE TABLE phpbb_gallery_albums_track ( - user_id INTEGER UNSIGNED NOT NULL DEFAULT '0', - album_id INTEGER UNSIGNED NOT NULL DEFAULT '0', - mark_time INTEGER UNSIGNED NOT NULL DEFAULT '0', - PRIMARY KEY (user_id, album_id) -); - - -# Table: 'phpbb_gallery_comments' -CREATE TABLE phpbb_gallery_comments ( - comment_id INTEGER PRIMARY KEY NOT NULL , - comment_image_id INTEGER UNSIGNED NOT NULL , - comment_user_id INTEGER UNSIGNED NOT NULL DEFAULT '0', - comment_username varchar(255) NOT NULL DEFAULT '', - comment_user_colour varchar(6) NOT NULL DEFAULT '', - comment_user_ip varchar(40) NOT NULL DEFAULT '', - comment_signature INTEGER UNSIGNED NOT NULL DEFAULT '0', - comment_time INTEGER UNSIGNED NOT NULL DEFAULT '0', - comment mediumtext(16777215) NOT NULL DEFAULT '', - comment_uid varchar(8) NOT NULL DEFAULT '', - comment_bitfield varchar(255) NOT NULL DEFAULT '', - comment_edit_time INTEGER UNSIGNED NOT NULL DEFAULT '0', - comment_edit_count INTEGER UNSIGNED NOT NULL DEFAULT '0', - comment_edit_user_id INTEGER UNSIGNED NOT NULL DEFAULT '0' -); - -CREATE INDEX phpbb_gallery_comments_id ON phpbb_gallery_comments (comment_image_id); -CREATE INDEX phpbb_gallery_comments_uid ON phpbb_gallery_comments (comment_user_id); -CREATE INDEX phpbb_gallery_comments_ip ON phpbb_gallery_comments (comment_user_ip); -CREATE INDEX phpbb_gallery_comments_time ON phpbb_gallery_comments (comment_time); - -# Table: 'phpbb_gallery_contests' -CREATE TABLE phpbb_gallery_contests ( - contest_id INTEGER PRIMARY KEY NOT NULL , - contest_album_id INTEGER UNSIGNED NOT NULL DEFAULT '0', - contest_start INTEGER UNSIGNED NOT NULL DEFAULT '0', - contest_rating INTEGER UNSIGNED NOT NULL DEFAULT '0', - contest_end INTEGER UNSIGNED NOT NULL DEFAULT '0', - contest_marked tinyint(1) NOT NULL DEFAULT '0', - contest_first INTEGER UNSIGNED NOT NULL DEFAULT '0', - contest_second INTEGER UNSIGNED NOT NULL DEFAULT '0', - contest_third INTEGER UNSIGNED NOT NULL DEFAULT '0' -); - - -# Table: 'phpbb_gallery_favorites' -CREATE TABLE phpbb_gallery_favorites ( - favorite_id INTEGER PRIMARY KEY NOT NULL , - user_id INTEGER UNSIGNED NOT NULL DEFAULT '0', - image_id INTEGER UNSIGNED NOT NULL DEFAULT '0' -); - -CREATE INDEX phpbb_gallery_favorites_uid ON phpbb_gallery_favorites (user_id); -CREATE INDEX phpbb_gallery_favorites_id ON phpbb_gallery_favorites (image_id); - -# Table: 'phpbb_gallery_images' -CREATE TABLE phpbb_gallery_images ( - image_id INTEGER PRIMARY KEY NOT NULL , - image_filename varchar(255) NOT NULL DEFAULT '', - image_name varchar(255) NOT NULL DEFAULT '', - image_name_clean varchar(255) NOT NULL DEFAULT '', - image_desc mediumtext(16777215) NOT NULL DEFAULT '', - image_desc_uid varchar(8) NOT NULL DEFAULT '', - image_desc_bitfield varchar(255) NOT NULL DEFAULT '', - image_user_id INTEGER UNSIGNED NOT NULL DEFAULT '0', - image_username varchar(255) NOT NULL DEFAULT '', - image_username_clean varchar(255) NOT NULL DEFAULT '', - image_user_colour varchar(6) NOT NULL DEFAULT '', - image_user_ip varchar(40) NOT NULL DEFAULT '', - image_time INTEGER UNSIGNED NOT NULL DEFAULT '0', - image_album_id INTEGER UNSIGNED NOT NULL DEFAULT '0', - image_view_count INTEGER UNSIGNED NOT NULL DEFAULT '0', - image_status INTEGER UNSIGNED NOT NULL DEFAULT '0', - image_contest INTEGER UNSIGNED NOT NULL DEFAULT '0', - image_contest_end INTEGER UNSIGNED NOT NULL DEFAULT '0', - image_contest_rank INTEGER UNSIGNED NOT NULL DEFAULT '0', - image_filemissing INTEGER UNSIGNED NOT NULL DEFAULT '0', - image_has_exif INTEGER UNSIGNED NOT NULL DEFAULT '2', - image_exif_data text(65535) NOT NULL DEFAULT '', - image_rates INTEGER UNSIGNED NOT NULL DEFAULT '0', - image_rate_points INTEGER UNSIGNED NOT NULL DEFAULT '0', - image_rate_avg INTEGER UNSIGNED NOT NULL DEFAULT '0', - image_comments INTEGER UNSIGNED NOT NULL DEFAULT '0', - image_last_comment INTEGER UNSIGNED NOT NULL DEFAULT '0', - image_allow_comments tinyint(1) NOT NULL DEFAULT '1', - image_favorited INTEGER UNSIGNED NOT NULL DEFAULT '0', - image_reported INTEGER UNSIGNED NOT NULL DEFAULT '0', - filesize_upload INTEGER UNSIGNED NOT NULL DEFAULT '0', - filesize_medium INTEGER UNSIGNED NOT NULL DEFAULT '0', - filesize_cache INTEGER UNSIGNED NOT NULL DEFAULT '0' -); - -CREATE INDEX phpbb_gallery_images_aid ON phpbb_gallery_images (image_album_id); -CREATE INDEX phpbb_gallery_images_uid ON phpbb_gallery_images (image_user_id); -CREATE INDEX phpbb_gallery_images_time ON phpbb_gallery_images (image_time); - -# Table: 'phpbb_gallery_modscache' -CREATE TABLE phpbb_gallery_modscache ( - album_id INTEGER UNSIGNED NOT NULL DEFAULT '0', - user_id INTEGER UNSIGNED NOT NULL DEFAULT '0', - username varchar(255) NOT NULL DEFAULT '', - group_id INTEGER UNSIGNED NOT NULL DEFAULT '0', - group_name varchar(255) NOT NULL DEFAULT '', - display_on_index tinyint(1) NOT NULL DEFAULT '1' -); - -CREATE INDEX phpbb_gallery_modscache_doi ON phpbb_gallery_modscache (display_on_index); -CREATE INDEX phpbb_gallery_modscache_aid ON phpbb_gallery_modscache (album_id); - -# Table: 'phpbb_gallery_permissions' -CREATE TABLE phpbb_gallery_permissions ( - perm_id INTEGER PRIMARY KEY NOT NULL , - perm_role_id INTEGER UNSIGNED NOT NULL DEFAULT '0', - perm_album_id INTEGER UNSIGNED NOT NULL DEFAULT '0', - perm_user_id INTEGER UNSIGNED NOT NULL DEFAULT '0', - perm_group_id INTEGER UNSIGNED NOT NULL DEFAULT '0', - perm_system int(3) NOT NULL DEFAULT '0' -); - - -# Table: 'phpbb_gallery_rates' -CREATE TABLE phpbb_gallery_rates ( - rate_image_id INTEGER UNSIGNED NOT NULL DEFAULT '0', - rate_user_id INTEGER UNSIGNED NOT NULL DEFAULT '0', - rate_user_ip varchar(40) NOT NULL DEFAULT '', - rate_point INTEGER UNSIGNED NOT NULL DEFAULT '0', - PRIMARY KEY (rate_image_id, rate_user_id) -); - - -# Table: 'phpbb_gallery_reports' -CREATE TABLE phpbb_gallery_reports ( - report_id INTEGER PRIMARY KEY NOT NULL , - report_album_id INTEGER UNSIGNED NOT NULL DEFAULT '0', - report_image_id INTEGER UNSIGNED NOT NULL DEFAULT '0', - reporter_id INTEGER UNSIGNED NOT NULL DEFAULT '0', - report_manager INTEGER UNSIGNED NOT NULL DEFAULT '0', - report_note mediumtext(16777215) NOT NULL DEFAULT '', - report_time INTEGER UNSIGNED NOT NULL DEFAULT '0', - report_status INTEGER UNSIGNED NOT NULL DEFAULT '0' -); - - -# Table: 'phpbb_gallery_roles' -CREATE TABLE phpbb_gallery_roles ( - role_id INTEGER PRIMARY KEY NOT NULL , - a_list INTEGER UNSIGNED NOT NULL DEFAULT '0', - i_view INTEGER UNSIGNED NOT NULL DEFAULT '0', - i_watermark INTEGER UNSIGNED NOT NULL DEFAULT '0', - i_upload INTEGER UNSIGNED NOT NULL DEFAULT '0', - i_edit INTEGER UNSIGNED NOT NULL DEFAULT '0', - i_delete INTEGER UNSIGNED NOT NULL DEFAULT '0', - i_rate INTEGER UNSIGNED NOT NULL DEFAULT '0', - i_approve INTEGER UNSIGNED NOT NULL DEFAULT '0', - i_lock INTEGER UNSIGNED NOT NULL DEFAULT '0', - i_report INTEGER UNSIGNED NOT NULL DEFAULT '0', - i_count INTEGER UNSIGNED NOT NULL DEFAULT '0', - i_unlimited INTEGER UNSIGNED NOT NULL DEFAULT '0', - c_read INTEGER UNSIGNED NOT NULL DEFAULT '0', - c_post INTEGER UNSIGNED NOT NULL DEFAULT '0', - c_edit INTEGER UNSIGNED NOT NULL DEFAULT '0', - c_delete INTEGER UNSIGNED NOT NULL DEFAULT '0', - m_comments INTEGER UNSIGNED NOT NULL DEFAULT '0', - m_delete INTEGER UNSIGNED NOT NULL DEFAULT '0', - m_edit INTEGER UNSIGNED NOT NULL DEFAULT '0', - m_move INTEGER UNSIGNED NOT NULL DEFAULT '0', - m_report INTEGER UNSIGNED NOT NULL DEFAULT '0', - m_status INTEGER UNSIGNED NOT NULL DEFAULT '0', - a_count INTEGER UNSIGNED NOT NULL DEFAULT '0', - a_unlimited INTEGER UNSIGNED NOT NULL DEFAULT '0', - a_restrict INTEGER UNSIGNED NOT NULL DEFAULT '0' -); - - -# Table: 'phpbb_gallery_users' -CREATE TABLE phpbb_gallery_users ( - user_id INTEGER UNSIGNED NOT NULL DEFAULT '0', - watch_own INTEGER UNSIGNED NOT NULL DEFAULT '0', - watch_favo INTEGER UNSIGNED NOT NULL DEFAULT '0', - watch_com INTEGER UNSIGNED NOT NULL DEFAULT '0', - user_images INTEGER UNSIGNED NOT NULL DEFAULT '0', - personal_album_id INTEGER UNSIGNED NOT NULL DEFAULT '0', - user_lastmark INTEGER UNSIGNED NOT NULL DEFAULT '0', - user_last_update INTEGER UNSIGNED NOT NULL DEFAULT '0', - user_viewexif INTEGER UNSIGNED NOT NULL DEFAULT '0', - user_permissions mediumtext(16777215) NOT NULL DEFAULT '', - user_permissions_changed INTEGER UNSIGNED NOT NULL DEFAULT '0', - user_allow_comments tinyint(1) NOT NULL DEFAULT '1', - subscribe_pegas tinyint(1) NOT NULL DEFAULT '0', - PRIMARY KEY (user_id) -); - -CREATE INDEX phpbb_gallery_users_pega ON phpbb_gallery_users (personal_album_id); - -# Table: 'phpbb_gallery_watch' -CREATE TABLE phpbb_gallery_watch ( - watch_id INTEGER PRIMARY KEY NOT NULL , - album_id INTEGER UNSIGNED NOT NULL DEFAULT '0', - image_id INTEGER UNSIGNED NOT NULL DEFAULT '0', - user_id INTEGER UNSIGNED NOT NULL DEFAULT '0' -); - -CREATE INDEX phpbb_gallery_watch_uid ON phpbb_gallery_watch (user_id); -CREATE INDEX phpbb_gallery_watch_id ON phpbb_gallery_watch (image_id); -CREATE INDEX phpbb_gallery_watch_aid ON phpbb_gallery_watch (album_id); - COMMIT; \ No newline at end of file diff --git a/tests/testframework/database_test_case.php b/tests/testframework/database_test_case.php index a7f3f642..6e291cf1 100644 --- a/tests/testframework/database_test_case.php +++ b/tests/testframework/database_test_case.php @@ -16,7 +16,6 @@ abstract class database_test_case extends \phpbb_database_test_case public function setUp() { parent::setUp(); - global $db; $db = $this->db = $this->new_dbal(); } From 68cd966f3b8c56b2609a521afbc4ae3f063b42c7 Mon Sep 17 00:00:00 2001 From: marc1706 Date: Thu, 6 Feb 2014 22:50:56 +0100 Subject: [PATCH 2/3] [ticket/212] Add tests for moving modules B3P-212 --- acp/portal_module.php | 2 +- tests/acp/fixtures/modules.xml | 33 +++++++++++++++ tests/acp/move_module_test.php | 73 ++++++++++++++++++++++++++++++++++ 3 files changed, 107 insertions(+), 1 deletion(-) create mode 100644 tests/acp/fixtures/modules.xml create mode 100644 tests/acp/move_module_test.php diff --git a/acp/portal_module.php b/acp/portal_module.php index d936b8d9..f4577839 100644 --- a/acp/portal_module.php +++ b/acp/portal_module.php @@ -834,7 +834,7 @@ class portal_module * * @param int $module_id ID of the module that should be moved */ - protected function move_module_up($module_id) + public function move_module_up($module_id) { $sql = 'SELECT module_order, module_column FROM ' . PORTAL_MODULES_TABLE . ' diff --git a/tests/acp/fixtures/modules.xml b/tests/acp/fixtures/modules.xml new file mode 100644 index 00000000..c2f193c4 --- /dev/null +++ b/tests/acp/fixtures/modules.xml @@ -0,0 +1,33 @@ + + + + module_id + module_classname + module_column + module_order + + 1 + \board3\portal\modules\clock + 2 + 1 + + + 2 + \board3\portal\modules\birthday_list + 2 + 2 + + + 3 + \board3\portal\modules\clock + 4 + 1 + + + 4 + \board3\portal\modules\birthday_list + 4 + 2 + +
+ diff --git a/tests/acp/move_module_test.php b/tests/acp/move_module_test.php new file mode 100644 index 00000000..892975a9 --- /dev/null +++ b/tests/acp/move_module_test.php @@ -0,0 +1,73 @@ +set('board3.version.check', + $this->getMockBuilder('\board3\portal\includes\mod_version_check') + ->disableOriginalConstructor() + ->getMock()); + // Mock module service collection + $phpbb_container->set('board3.module_collection', + array( + new \board3\portal\modules\clock(), + new \board3\portal\modules\birthday_list(new \phpbb\config\config(array()), $template, $this->db, $user), + )); + $cache = $this->getMock('\phpbb\cache\cache', array('destroy', 'sql_exists')); + $cache->expects($this->any()) + ->method('destroy') + ->with($this->equalTo('portal_modules')); + $cache->expects($this->any()) + ->method('sql_exists') + ->with($this->anything()); + $db = $this->db; + $this->portal_module = new \board3\portal\acp\portal_module(); + } + + public function getDataSet() + { + return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/modules.xml'); + } + + public function test_move_module_up() + { + self::$redirected = false; + $this->portal_module->move_module_up(2); + $this->assertTrue(self::$redirected); + + $this->setExpectedTriggerError(E_USER_NOTICE); + self::$redirected = false; + $this->portal_module->move_module_up(2); + $this->assertFalse(self::$redirected); + } +} + +function redirect($url) +{ + phpbb_acp_move_module_test::$redirected = true; +} + +function adm_back_link($url) +{ + return $url; +} From 19b4a3a5a0c4ab53dce92e868ed26205340b6773 Mon Sep 17 00:00:00 2001 From: marc1706 Date: Thu, 6 Feb 2014 23:12:33 +0100 Subject: [PATCH 3/3] [ticket/212] Fix base database test B3P-212 --- tests/systemtests/base_database_test.php | 11 +++--- tests/systemtests/fixtures/basetests.xml | 46 ++++++++++++------------ 2 files changed, 29 insertions(+), 28 deletions(-) diff --git a/tests/systemtests/base_database_test.php b/tests/systemtests/base_database_test.php index ecc97a8d..edb86d2d 100644 --- a/tests/systemtests/base_database_test.php +++ b/tests/systemtests/base_database_test.php @@ -18,15 +18,14 @@ class base_database_test extends \board3\portal\tests\testframework\database_tes public function test_check() { - $sql = 'SELECT session_user_id, album_name - FROM phpbb_sessions s - LEFT JOIN phpbb_gallery_albums a - ON (s.session_album_id = a.album_id)'; + $sql = 'SELECT module_id, module_column + FROM phpbb_portal_modules + WHERE module_id = 1'; $result = $this->db->sql_query($sql); $this->assertEquals(array( array( - 'session_user_id' => 4, - 'album_name' => 'Testalbum', + 'module_id' => 1, + 'module_column' => 2 ), ), $this->db->sql_fetchrowset($result)); $this->db->sql_freeresult($result); diff --git a/tests/systemtests/fixtures/basetests.xml b/tests/systemtests/fixtures/basetests.xml index 2292db09..c2f193c4 100644 --- a/tests/systemtests/fixtures/basetests.xml +++ b/tests/systemtests/fixtures/basetests.xml @@ -1,31 +1,33 @@ - - session_id - session_user_id - session_album_id - session_ip - session_browser - session_admin +
+ module_id + module_classname + module_column + module_order - bar_session000000000000000000000 - 4 - 42 - 127.0.0.1 - user agent + 1 + \board3\portal\modules\clock + 2 1 -
- - album_id - album_name - album_parents - album_desc - 42 - Testalbum - - + 2 + \board3\portal\modules\birthday_list + 2 + 2 + + + 3 + \board3\portal\modules\clock + 4 + 1 + + + 4 + \board3\portal\modules\birthday_list + 4 + 2