aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Guse <nathaniel.guse@gmail.com>2013-01-31 10:14:42 -0600
committerNathan Guse <nathaniel.guse@gmail.com>2013-01-31 10:14:42 -0600
commitb567e0963099b911e0d1d7b262c777a6969aad1f (patch)
treeb29ae051bc1dc898486f4218ac4e789713a293e6
parentbd499425522a61ddd617e9ac4cfed9a7859bf949 (diff)
downloadforums-b567e0963099b911e0d1d7b262c777a6969aad1f.tar
forums-b567e0963099b911e0d1d7b262c777a6969aad1f.tar.gz
forums-b567e0963099b911e0d1d7b262c777a6969aad1f.tar.bz2
forums-b567e0963099b911e0d1d7b262c777a6969aad1f.tar.xz
forums-b567e0963099b911e0d1d7b262c777a6969aad1f.zip
[ticket/11103] Remove Primary Key on user_notifications table
PHPBB3-11103
Diffstat
-rw-r--r--phpBB/develop/create_schema_files.php6
-rw-r--r--phpBB/install/database_update.php6
-rw-r--r--phpBB/install/schemas/firebird_schema.sql2
-rw-r--r--phpBB/install/schemas/mssql_schema.sql10
-rw-r--r--phpBB/install/schemas/mysql_40_schema.sql3
-rw-r--r--phpBB/install/schemas/mysql_41_schema.sql3
-rw-r--r--phpBB/install/schemas/oracle_schema.sql3
-rw-r--r--phpBB/install/schemas/postgres_schema.sql3
-rw-r--r--phpBB/install/schemas/sqlite_schema.sql3
9 files changed, 5 insertions, 34 deletions
diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index a280d3880a..6389ce7e7c 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -1790,12 +1790,6 @@ function get_schema_struct()
'method' => array('VCHAR:255', ''),
'notify' => array('BOOL', 1),
),
- 'PRIMARY_KEY' => array(
- 'item_type',
- 'item_id',
- 'user_id',
- 'method',
- ),
);
$schema_data['phpbb_user_group'] = array(
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 57a027cf2a..45632a0c3a 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1213,12 +1213,6 @@ function database_update_info()
'method' => array('VCHAR:255', ''),
'notify' => array('BOOL', 1),
),
- 'PRIMARY_KEY' => array(
- 'item_type',
- 'item_id',
- 'user_id',
- 'method',
- ),
),
),
'add_columns' => array(
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index d654193d7b..a1b4c4e0ee 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -1252,8 +1252,6 @@ CREATE TABLE phpbb_user_notifications (
notify INTEGER DEFAULT 1 NOT NULL
);;
-ALTER TABLE phpbb_user_notifications ADD PRIMARY KEY (item_type, item_id, user_id, method);;
-
# Table: 'phpbb_user_group'
CREATE TABLE phpbb_user_group (
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 30016e43b1..38e01504cb 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -1538,16 +1538,6 @@ CREATE TABLE [phpbb_user_notifications] (
) ON [PRIMARY]
GO
-ALTER TABLE [phpbb_user_notifications] WITH NOCHECK ADD
- CONSTRAINT [PK_phpbb_user_notifications] PRIMARY KEY CLUSTERED
- (
- [item_type],
- [item_id],
- [user_id],
- [method]
- ) ON [PRIMARY]
-GO
-
/*
Table: 'phpbb_user_group'
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index fef5357d2a..19df59f6f2 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -884,8 +884,7 @@ CREATE TABLE phpbb_user_notifications (
item_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
method varbinary(255) DEFAULT '' NOT NULL,
- notify tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
- PRIMARY KEY (item_type, item_id, user_id, method)
+ notify tinyint(1) UNSIGNED DEFAULT '1' NOT NULL
);
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index a797c36c20..3fde7030a6 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -884,8 +884,7 @@ CREATE TABLE phpbb_user_notifications (
item_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
method varchar(255) DEFAULT '' NOT NULL,
- notify tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
- PRIMARY KEY (item_type, item_id, user_id, method)
+ notify tinyint(1) UNSIGNED DEFAULT '1' NOT NULL
) CHARACTER SET `utf8` COLLATE `utf8_bin`;
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index 8932f04820..0852524691 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -1650,8 +1650,7 @@ CREATE TABLE phpbb_user_notifications (
item_id number(8) DEFAULT '0' NOT NULL,
user_id number(8) DEFAULT '0' NOT NULL,
method varchar2(255) DEFAULT '' ,
- notify number(1) DEFAULT '1' NOT NULL,
- CONSTRAINT pk_phpbb_user_notifications PRIMARY KEY (item_type, item_id, user_id, method)
+ notify number(1) DEFAULT '1' NOT NULL
)
/
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index 426f2decbf..8892357805 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -1136,8 +1136,7 @@ CREATE TABLE phpbb_user_notifications (
item_id INT4 DEFAULT '0' NOT NULL CHECK (item_id >= 0),
user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0),
method varchar(255) DEFAULT '' NOT NULL,
- notify INT2 DEFAULT '1' NOT NULL CHECK (notify >= 0),
- PRIMARY KEY (item_type, item_id, user_id, method)
+ notify INT2 DEFAULT '1' NOT NULL CHECK (notify >= 0)
);
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index fb6797deb6..6b3f4ac60b 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -857,8 +857,7 @@ CREATE TABLE phpbb_user_notifications (
item_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
user_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
method varchar(255) NOT NULL DEFAULT '',
- notify INTEGER UNSIGNED NOT NULL DEFAULT '1',
- PRIMARY KEY (item_type, item_id, user_id, method)
+ notify INTEGER UNSIGNED NOT NULL DEFAULT '1'
);
generated by cgit v1.2.1 (git 2.21.0) at 2025-04-01 21:21:37 +0000