aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2005-10-04 21:26:04 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2005-10-04 21:26:04 +0000
commit95ff1f3b64fdbf7d72fa86a94cf606a0369aa6bd (patch)
treef620dc91729ec604947f1a5e8223a1aab36a1b7d
parent5082f5eb7303ad52c5d440f1cf1466d886e9feef (diff)
downloadforums-95ff1f3b64fdbf7d72fa86a94cf606a0369aa6bd.tar
forums-95ff1f3b64fdbf7d72fa86a94cf606a0369aa6bd.tar.gz
forums-95ff1f3b64fdbf7d72fa86a94cf606a0369aa6bd.tar.bz2
forums-95ff1f3b64fdbf7d72fa86a94cf606a0369aa6bd.tar.xz
forums-95ff1f3b64fdbf7d72fa86a94cf606a0369aa6bd.zip
- the schema/data changes needed for the new module class
git-svn-id: file:///svn/phpbb/trunk@5253 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/install/schemas/firebird_schema.sql22
-rw-r--r--phpBB/install/schemas/mssql_schema.sql20
-rw-r--r--phpBB/install/schemas/mysql_schema.sql40
-rw-r--r--phpBB/install/schemas/oracle_schema.sql18
-rw-r--r--phpBB/install/schemas/postgres_schema.sql17
-rw-r--r--phpBB/install/schemas/schema_data.sql43
-rw-r--r--phpBB/install/schemas/sqlite_schema.sql21
7 files changed, 107 insertions, 74 deletions
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 80e6cced79..8873ade3d6 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -283,13 +283,15 @@ CREATE TABLE phpbb_moderator_cache (
# phpbb_modules
CREATE TABLE phpbb_modules (
module_id INTEGER NOT NULL,
- module_type VARCHAR(3) NOT NULL,
- module_title VARCHAR(50) NOT NULL,
- module_filename VARCHAR(50) NOT NULL,
- module_order INTEGER DEFAULT 0 NOT NULL,
module_enabled INTEGER DEFAULT 1 NOT NULL,
- module_subs BLOB SUB_TYPE TEXT NOT NULL,
- module_acl VARCHAR(255) NOT NULL
+ module_name VARCHAR(20) NOT NULL,
+ module_class VARCHAR(4) NOT NULL,
+ parent_id INTEGER NOT NULL,
+ left_id INTEGER NOT NULL,
+ right_id INTEGER NOT NULL,
+ module_langname VARCHAR(50) NOT NULL,
+ module_mode VARCHAR(255) NOT NULL,
+ module_auth VARCHAR(255) NOT NULL,
);;
# phpbb_poll_results
@@ -1073,12 +1075,16 @@ ADD PRIMARY KEY (
module_id
);;
-CREATE INDEX module_type31
+CREATE INDEX module_enabled31
ON phpbb_modules(
- module_type,
module_enabled
);;
+CREATE INDEX left_id31_2
+ON phpbb_modules(
+ left_id
+);;
+
CREATE INDEX poll_option_id32
ON phpbb_poll_results(
poll_option_id
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 4f8de86d90..ccab858787 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -288,13 +288,15 @@ GO
CREATE TABLE [phpbb_modules] (
[module_id] [int] IDENTITY (1, 1) NOT NULL ,
- [module_type] [varchar] (3) NOT NULL ,
- [module_title] [varchar] (50) NOT NULL ,
- [module_filename] [varchar] (50) NOT NULL ,
- [module_order] [int] NOT NULL ,
[module_enabled] [int] NOT NULL ,
- [module_subs] [text] NOT NULL ,
- [module_acl] [varchar] (255) NOT NULL
+ [module_name] [varchar] (20) NOT NULL ,
+ [module_class] [varchar] (4) NOT NULL ,
+ [parent_id] [int] NOT NULL ,
+ [left_id] [int] NOT NULL ,
+ [right_id] [int] NOT NULL ,
+ [module_langname] [varchar] (50) NOT NULL ,
+ [module_mode] [varchar] (255) NOT NULL ,
+ [module_auth] [varchar] (255) NOT NULL
) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
GO
@@ -1323,7 +1325,6 @@ ALTER TABLE [phpbb_moderator_cache] WITH NOCHECK ADD
GO
ALTER TABLE [phpbb_modules] WITH NOCHECK ADD
- CONSTRAINT [DF_module_module_order] DEFAULT (0) FOR [module_order],
CONSTRAINT [DF_module_module_enabled] DEFAULT (1) FOR [module_enabled]
GO
@@ -1712,7 +1713,10 @@ GO
CREATE INDEX [forum_id] ON [phpbb_moderator_cache]([forum_id]) ON [PRIMARY]
GO
-CREATE INDEX [module_type] ON [phpbb_modules]([module_type], [module_enabled]) ON [PRIMARY]
+CREATE INDEX [module_enabled] ON [phpbb_modules]([module_enabled]) ON [PRIMARY]
+GO
+
+CREATE INDEX [module_left_id] ON [phpbb_modules]([left_id]) ON [PRIMARY]
GO
CREATE INDEX [poll_option_id] ON [phpbb_poll_results]([poll_option_id]) ON [PRIMARY]
diff --git a/phpBB/install/schemas/mysql_schema.sql b/phpBB/install/schemas/mysql_schema.sql
index 97318e7a1e..cec502c424 100644
--- a/phpBB/install/schemas/mysql_schema.sql
+++ b/phpBB/install/schemas/mysql_schema.sql
@@ -331,34 +331,20 @@ CREATE TABLE phpbb_moderator_cache (
);
# Table: 'phpbb_modules'
-#CREATE TABLE phpbb_modules (
-# module_id smallint(5) unsigned NOT NULL auto_increment,
-# module_enabled tinyint(1) NOT NULL default '1',
-# module_type varchar(4) NOT NULL default '',
-# module_cat tinyint(4) NOT NULL default '0',
-# parent_id smallint(5) unsigned NOT NULL default '0',
-# left_id smallint(5) unsigned NOT NULL default '0',
-# right_id smallint(5) unsigned NOT NULL default '0',
-# module_filename varchar(150) NOT NULL default '',
-# module_name varchar(150) NOT NULL default '',
-# module_mode varchar(255) NOT NULL default '',
-# module_auth varchar(255) NOT NULL default '',
-# PRIMARY KEY (module_id),
-# KEY left_id (left_id),
-# KEY module_type (module_type)
-#);
-
CREATE TABLE phpbb_modules (
- module_id mediumint(8) NOT NULL auto_increment,
- module_type char(3) DEFAULT '' NOT NULL,
- module_title varchar(50) DEFAULT '' NOT NULL,
- module_filename varchar(50) DEFAULT '' NOT NULL,
- module_order mediumint(4) DEFAULT '0' NOT NULL,
- module_enabled tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
- module_subs text NOT NULL,
- module_acl varchar(255) DEFAULT '' NOT NULL,
- PRIMARY KEY (module_id),
- KEY module_type (module_type,module_enabled)
+ module_id smallint(5) unsigned NOT NULL auto_increment,
+ module_enabled tinyint(1) NOT NULL default '1',
+ module_name varchar(20) NOT NULL default '',
+ module_class varchar(4) NOT NULL default '',
+ parent_id smallint(5) unsigned NOT NULL default '0',
+ left_id smallint(5) unsigned NOT NULL default '0',
+ right_id smallint(5) unsigned NOT NULL default '0',
+ module_langname varchar(50) NOT NULL default '',
+ module_mode varchar(255) NOT NULL default '',
+ module_auth varchar(255) NOT NULL default '',
+ PRIMARY KEY (module_id),
+ KEY left_id (left_id),
+ KEY module_enabled (module_enabled)
);
# Table: 'phpbb_poll_results'
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index 84e8befa2c..8add2daeb1 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -699,13 +699,15 @@ CREATE INDEX forum_id03 on phpbb_moderator_cache (forum_id)
*/
CREATE TABLE phpbb_modules (
module_id number(8) NOT NULL,
- module_type varchar2(3) DEFAULT '',
- module_title varchar2(50) DEFAULT '',
- module_filename varchar2(50) DEFAULT '',
- module_order number(4) DEFAULT '0' NOT NULL,
module_enabled number(1) DEFAULT '1' NOT NULL,
- module_subs clob,
- module_acl varchar2(255) DEFAULT '',
+ module_name varchar2(20) DEFAULT '' NOT NULL,
+ module_class varchar2(4) DEFAULT '' NOT NULL,
+ parent_id number(5) DEFAULT '0' NOT NULL,
+ left_id number(5) DEFAULT '0' NOT NULL,
+ right_id number(5) DEFAULT '0' NOT NULL,
+ module_langname varchar2(50) DEFAULT '' NOT NULL,
+ module_mode varchar2(255) DEFAULT '' NOT NULL,
+ module_auth varchar2(255) DEFAULT '' NOT NULL,
CONSTRAINT pk_phpbb_modules PRIMARY KEY (module_id)
)
/
@@ -725,7 +727,9 @@ BEGIN
END;
/
-CREATE INDEX module_type on phpbb_modules (module_type, module_enabled)
+CREATE INDEX module_enabled on phpbb_modules (module_enabled)
+/
+CREATE INDEX module_left_id on phpbb_modules (left_id)
/
/*
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index 0248852182..9f7e4c4493 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -457,18 +457,21 @@ CREATE SEQUENCE phpbb_modules_module_id_seq;
CREATE TABLE phpbb_modules (
module_id INT4 DEFAULT nextval('phpbb_modules_module_id_seq'),
- module_type varchar(3) DEFAULT '' NOT NULL,
- module_title varchar(50) DEFAULT '' NOT NULL,
- module_filename varchar(50) DEFAULT '' NOT NULL,
- module_order INT4 DEFAULT '0' NOT NULL,
module_enabled INT2 DEFAULT '1' NOT NULL,
- module_subs TEXT DEFAULT '' NOT NULL,
- module_acl varchar(255) DEFAULT '' NOT NULL,
+ module_name varchar(20) DEFAULT '' NOT NULL,
+ module_class varchar(4) DEFAULT '' NOT NULL,
+ parent_id INT4 DEFAULT '0' NOT NULL,
+ left_id INT4 DEFAULT '0' NOT NULL,
+ right_id INT4 DEFAULT '0' NOT NULL,
+ module_langname varchar(50) DEFAULT '' NOT NULL,
+ module_mode varchar(255) DEFAULT '' NOT NULL,
+ module_auth varchar(255) DEFAULT '' NOT NULL,
PRIMARY KEY (module_id),
CHECK (module_enabled>=0)
);
-CREATE INDEX module_type_phpbb_modules_index ON phpbb_modules (module_type,module_enabled);
+CREATE INDEX module_enabled_phpbb_modules_index ON phpbb_modules (module_enabled);
+CREATE INDEX left_id_phpbb_modules_index ON phpbb_modules (left_id);
SELECT SETVAL('phpbb_modules_module_id_seq',(select case when max(module_id)>0 then max(module_id)+1 else 1 end from phpbb_modules));
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 6b4cd59fdc..a333d1b61d 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -429,14 +429,41 @@ INSERT INTO phpbb_bots (bot_id, bot_active, bot_name, user_id, bot_agent, bot_ip
# MSSQL IDENTITY phpbb_modules OFF #
# -- Modules
-INSERT INTO phpbb_modules (module_type, module_title, module_filename, module_order, module_enabled, module_subs, module_acl) VALUES ('ucp', 'MAIN', 'main', 1, 1, 'front\r\nsubscribed\r\nbookmarks,cfg_allow_bookmarks\r\ndrafts', '');
-INSERT INTO phpbb_modules (module_type, module_title, module_filename, module_order, module_enabled, module_subs, module_acl) VALUES ('ucp', 'PM', 'pm', 2, 1, 'view_messages\r\ncompose\r\nunread\r\ndrafts\r\noptions', 'cfg_allow_privmsg');
-INSERT INTO phpbb_modules (module_type, module_title, module_filename, module_order, module_enabled, module_subs, module_acl) VALUES ('ucp', 'PROFILE', 'profile', 3, 1, 'profile_info\r\nreg_details\r\nsignature\r\navatar', '');
-INSERT INTO phpbb_modules (module_type, module_title, module_filename, module_order, module_enabled, module_subs, module_acl) VALUES ('ucp', 'PREFS', 'prefs', 4, 1, 'personal\r\nview\r\npost', '');
-INSERT INTO phpbb_modules (module_type, module_title, module_filename, module_order, module_enabled, module_subs, module_acl) VALUES ('ucp', 'ZEBRA', 'zebra', 5, 1, 'friends\r\nfoes', '');
-INSERT INTO phpbb_modules (module_type, module_title, module_filename, module_order, module_enabled, module_subs, module_acl) VALUES ('ucp', 'ATTACHMENTS', 'attachments', 6, 1, '', 'acl_u_attach && cfg_allow_attachments');
-INSERT INTO phpbb_modules (module_type, module_title, module_filename, module_order, module_enabled, module_subs, module_acl) VALUES ('mcp', 'MAIN', 'main', 1, 1, 'front\r\nforum_view\r\ntopic_view\r\npost_details', 'acl_m_');
-INSERT INTO phpbb_modules (module_type, module_title, module_filename, module_order, module_enabled, module_subs, module_acl) VALUES ('mcp', 'QUEUE', 'queue', 2, 1, 'unapproved_topics\r\nunapproved_posts\r\nreports', 'acl_m_approve');
+INSERT INTO phpbb_modules (module_id, module_enabled, module_name, module_class, parent_id, left_id, right_id, module_langname, module_mode, module_auth) VALUES (13, 1, '', 'ucp', 0, 19, 28, 'UCP_MAIN', '', '');
+INSERT INTO phpbb_modules (module_id, module_enabled, module_name, module_class, parent_id, left_id, right_id, module_langname, module_mode, module_auth) VALUES (14, 1, 'main', 'ucp', 13, 20, 21, 'UCP_MAIN_FRONT', 'front', '');
+INSERT INTO phpbb_modules (module_id, module_enabled, module_name, module_class, parent_id, left_id, right_id, module_langname, module_mode, module_auth) VALUES (15, 1, 'main', 'ucp', 13, 22, 23, 'UCP_MAIN_SUBSCRIBED', 'subscribed', '');
+INSERT INTO phpbb_modules (module_id, module_enabled, module_name, module_class, parent_id, left_id, right_id, module_langname, module_mode, module_auth) VALUES (16, 1, 'main', 'ucp', 13, 24, 25, 'UCP_MAIN_BOOKMARKS', 'bookmarks', '');
+INSERT INTO phpbb_modules (module_id, module_enabled, module_name, module_class, parent_id, left_id, right_id, module_langname, module_mode, module_auth) VALUES (17, 1, 'main', 'ucp', 13, 26, 27, 'UCP_MAIN_DRAFTS', 'drafts', '');
+
+INSERT INTO phpbb_modules (module_id, module_enabled, module_name, module_class, parent_id, left_id, right_id, module_langname, module_mode, module_auth) VALUES (18, 1, '', 'ucp', 0, 29, 38, 'UCP_PROFILE', '', '');
+INSERT INTO phpbb_modules (module_id, module_enabled, module_name, module_class, parent_id, left_id, right_id, module_langname, module_mode, module_auth) VALUES (19, 1, 'profile', 'ucp', 18, 30, 31, 'UCP_PROFILE_REG_DETAILS', 'reg_details', '');
+INSERT INTO phpbb_modules (module_id, module_enabled, module_name, module_class, parent_id, left_id, right_id, module_langname, module_mode, module_auth) VALUES (20, 1, 'profile', 'ucp', 18, 32, 33, 'UCP_PROFILE_PROFILE_INFO', 'profile_info', '');
+INSERT INTO phpbb_modules (module_id, module_enabled, module_name, module_class, parent_id, left_id, right_id, module_langname, module_mode, module_auth) VALUES (21, 1, 'profile', 'ucp', 18, 34, 35, 'UCP_PROFILE_SIGNATURE', 'signature', '');
+INSERT INTO phpbb_modules (module_id, module_enabled, module_name, module_class, parent_id, left_id, right_id, module_langname, module_mode, module_auth) VALUES (22, 1, 'profile', 'ucp', 18, 36, 37, 'UCP_PROFILE_AVATAR', 'avatar', '');
+
+INSERT INTO phpbb_modules (module_id, module_enabled, module_name, module_class, parent_id, left_id, right_id, module_langname, module_mode, module_auth) VALUES (23, 1, '', 'ucp', 0, 39, 46, 'UCP_PREFS', '', '');
+INSERT INTO phpbb_modules (module_id, module_enabled, module_name, module_class, parent_id, left_id, right_id, module_langname, module_mode, module_auth) VALUES (24, 1, 'prefs', 'ucp', 23, 40, 41, 'UCP_PREFS_PERSONAL', 'personal', '');
+INSERT INTO phpbb_modules (module_id, module_enabled, module_name, module_class, parent_id, left_id, right_id, module_langname, module_mode, module_auth) VALUES (25, 1, 'prefs', 'ucp', 23, 42, 43, 'UCP_PREFS_VIEW', 'view', '');
+INSERT INTO phpbb_modules (module_id, module_enabled, module_name, module_class, parent_id, left_id, right_id, module_langname, module_mode, module_auth) VALUES (26, 1, 'prefs', 'ucp', 23, 44, 45, 'UCP_PREFS_POST', 'post', '');
+
+INSERT INTO phpbb_modules (module_id, module_enabled, module_name, module_class, parent_id, left_id, right_id, module_langname, module_mode, module_auth) VALUES (27, 1, '', 'ucp', 0, 47, 58, 'UCP_PM', '', '');
+INSERT INTO phpbb_modules (module_id, module_enabled, module_name, module_class, parent_id, left_id, right_id, module_langname, module_mode, module_auth) VALUES (28, 1, 'pm', 'ucp', 27, 48, 49, 'UCP_PM_VIEW', 'view', 'cfg_allow_privmsg');
+INSERT INTO phpbb_modules (module_id, module_enabled, module_name, module_class, parent_id, left_id, right_id, module_langname, module_mode, module_auth) VALUES (29, 1, 'pm', 'ucp', 27, 50, 51, 'UCP_PM_COMPOSE', 'compose', 'cfg_allow_privmsg');
+INSERT INTO phpbb_modules (module_id, module_enabled, module_name, module_class, parent_id, left_id, right_id, module_langname, module_mode, module_auth) VALUES (30, 1, 'pm', 'ucp', 27, 52, 53, 'UCP_PM_UNREAD', 'unread', 'cfg_allow_privmsg');
+INSERT INTO phpbb_modules (module_id, module_enabled, module_name, module_class, parent_id, left_id, right_id, module_langname, module_mode, module_auth) VALUES (31, 1, 'pm', 'ucp', 27, 54, 55, 'UCP_PM_DRAFTS', 'drafts', 'cfg_allow_privmsg');
+INSERT INTO phpbb_modules (module_id, module_enabled, module_name, module_class, parent_id, left_id, right_id, module_langname, module_mode, module_auth) VALUES (32, 1, 'pm', 'ucp', 27, 56, 57, 'UCP_PM_OPTIONS', 'options', 'cfg_allow_privmsg');
+
+INSERT INTO phpbb_modules (module_id, module_enabled, module_name, module_class, parent_id, left_id, right_id, module_langname, module_mode, module_auth) VALUES (33, 1, '', 'ucp', 0, 59, 64, 'UCP_USERGROUPS', '', '');
+INSERT INTO phpbb_modules (module_id, module_enabled, module_name, module_class, parent_id, left_id, right_id, module_langname, module_mode, module_auth) VALUES (34, 1, 'groups', 'ucp', 33, 60, 61, 'UCP_USERGROUPS_MEMBER', 'membership', '');
+INSERT INTO phpbb_modules (module_id, module_enabled, module_name, module_class, parent_id, left_id, right_id, module_langname, module_mode, module_auth) VALUES (35, 1, 'groups', 'ucp', 33, 62, 63, 'UCP_USERGROUPS_MANAGE', 'manage', '');
+
+INSERT INTO phpbb_modules (module_id, module_enabled, module_name, module_class, parent_id, left_id, right_id, module_langname, module_mode, module_auth) VALUES (36, 1, '', 'ucp', 0, 65, 68, 'UCP_ATTACHMENTS', '', '');
+INSERT INTO phpbb_modules (module_id, module_enabled, module_name, module_class, parent_id, left_id, right_id, module_langname, module_mode, module_auth) VALUES (37, 1, 'attachments', 'ucp', 36, 66, 67, 'UCP_ATTACHMENTS', 'default', '');
+
+INSERT INTO phpbb_modules (module_id, module_enabled, module_name, module_class, parent_id, left_id, right_id, module_langname, module_mode, module_auth) VALUES (38, 1, '', 'ucp', 0, 69, 74, 'UCP_ZEBRA', '', '');
+INSERT INTO phpbb_modules (module_id, module_enabled, module_name, module_class, parent_id, left_id, right_id, module_langname, module_mode, module_auth) VALUES (39, 1, 'zebra', 'ucp', 38, 70, 71, 'UCP_ZEBRA_FRIENDS', 'friends', '');
+INSERT INTO phpbb_modules (module_id, module_enabled, module_name, module_class, parent_id, left_id, right_id, module_langname, module_mode, module_auth) VALUES (40, 1, 'zebra', 'ucp', 38, 72, 73, 'UCP_ZEBRA_FOES', 'foes', '');
+
# MSSQL IDENTITY phpbb_modules OFF #
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index 88e1ed05ba..906e934646 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -334,16 +334,19 @@ CREATE INDEX forum_id_phpbb_moderator_cache on phpbb_moderator_cache (forum_id);
# Table: phpbb_modules
CREATE TABLE phpbb_modules (
module_id INTEGER PRIMARY KEY NOT NULL,
- module_type char(3) NOT NULL DEFAULT '',
- module_title varchar(50) NOT NULL DEFAULT '',
- module_filename varchar(50) NOT NULL DEFAULT '',
- module_order mediumint(4) NOT NULL DEFAULT '0',
module_enabled tinyint(1) NOT NULL DEFAULT '1',
- module_subs text(65535) NOT NULL,
- module_acl varchar(255) NOT NULL DEFAULT ''
-);
-
-CREATE INDEX module_type_phpbb_modules on phpbb_modules (module_type, module_enabled);
+ module_name varchar(20) NOT NULL DEFAULT '',
+ module_class varchar(4) NOT NULL DEFAULT '',
+ parent_id smallint(5) NOT NULL DEFAULT '0',
+ left_id smallint(5) NOT NULL DEFAULT '0',
+ right_id smallint(5) NOT NULL DEFAULT '0',
+ module_langname varchar(50) NOT NULL DEFAULT '',
+ module_mode varchar(255) NOT NULL DEFAULT '',
+ module_auth varchar(255) NOT NULL DEFAULT ''
+);
+
+CREATE INDEX module_enabled_phpbb_modules on phpbb_modules (module_enabled);
+CREATE INDEX left_id_phpbb_modules on phpbb_modules (left_id);
# Table: phpbb_poll_results
CREATE TABLE phpbb_poll_results (