diff options
| author | David King <imkingdavid@gmail.com> | 2013-05-20 11:54:39 -0400 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-05-20 11:54:39 -0400 |
| commit | fedd9d18d2ab2c06fd584f599e685014783b9655 (patch) | |
| tree | 352ca31c2a003d91a0101176c8ab92ca1021dcb0 /phpBB/install/schemas/mssql_schema.sql | |
| parent | 9fab868f0f0a420b4eb7efb42e9c4cf27e66e9b3 (diff) | |
| parent | 05cd045923068b08962856ec5e0c36f72f8f831c (diff) | |
| download | forums-fedd9d18d2ab2c06fd584f599e685014783b9655.tar forums-fedd9d18d2ab2c06fd584f599e685014783b9655.tar.gz forums-fedd9d18d2ab2c06fd584f599e685014783b9655.tar.bz2 forums-fedd9d18d2ab2c06fd584f599e685014783b9655.tar.xz forums-fedd9d18d2ab2c06fd584f599e685014783b9655.zip | |
Merge remote-tracking branch 'EXreaction/ticket/11413' into develop
* EXreaction/ticket/11413: (23 commits)
[ticket/11413] Revert some cache service related changes from earlier
[ticket/11413] Use phpbb_user in test
[ticket/11413] $user should have been $this->user
[ticket/11413] Fix unit tests
[ticket/11413] Translate the error
[ticket/11413] Rename file to something more helpful
[ticket/11413] Remove remaining irrelevant code to this PR
[ticket/11413] Remove mock sql_insert_buffer.php (not relevant to PR)
[ticket/11413] Remove conversion of user_notifications
[ticket/11413] Correct copyright year
[ticket/11413] Remove changes for ticket 11420 from this branch
[ticket/11413] Include mock class
[ticket/11413] Don't use the database for the convert test
[ticket/11413] Test get_notification_type_id and _ids functions
[ticket/11413] Use sql_insert_buffer
[ticket/11413] Create test for notification conversion
[ticket/11413] Fix test fixtures and tests
[ticket/11413] Fix some more tests
[ticket/11413] Fix notification tests
[ticket/11413] Prevent recursive function calls
...
Diffstat (limited to 'phpBB/install/schemas/mssql_schema.sql')
| -rw-r--r-- | phpBB/install/schemas/mssql_schema.sql | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql index 3530f9cd25..8465dc4d72 100644 --- a/phpBB/install/schemas/mssql_schema.sql +++ b/phpBB/install/schemas/mssql_schema.sql @@ -793,7 +793,8 @@ GO Table: 'phpbb_notification_types' */ CREATE TABLE [phpbb_notification_types] ( - [notification_type] [varchar] (255) DEFAULT ('') NOT NULL , + [notification_type_id] [int] IDENTITY (1, 1) NOT NULL , + [notification_type_name] [varchar] (255) DEFAULT ('') NOT NULL , [notification_type_enabled] [int] DEFAULT (1) NOT NULL ) ON [PRIMARY] GO @@ -801,18 +802,20 @@ GO ALTER TABLE [phpbb_notification_types] WITH NOCHECK ADD CONSTRAINT [PK_phpbb_notification_types] PRIMARY KEY CLUSTERED ( - [notification_type], - [notification_type_enabled] + [notification_type_id] ) ON [PRIMARY] GO +CREATE UNIQUE INDEX [type] ON [phpbb_notification_types]([notification_type_name]) ON [PRIMARY] +GO + /* Table: 'phpbb_notifications' */ CREATE TABLE [phpbb_notifications] ( [notification_id] [int] IDENTITY (1, 1) NOT NULL , - [item_type] [varchar] (255) DEFAULT ('') NOT NULL , + [notification_type_id] [int] DEFAULT (0) NOT NULL , [item_id] [int] DEFAULT (0) NOT NULL , [item_parent_id] [int] DEFAULT (0) NOT NULL , [user_id] [int] DEFAULT (0) NOT NULL , @@ -829,7 +832,7 @@ ALTER TABLE [phpbb_notifications] WITH NOCHECK ADD ) ON [PRIMARY] GO -CREATE INDEX [item_ident] ON [phpbb_notifications]([item_type], [item_id]) ON [PRIMARY] +CREATE INDEX [item_ident] ON [phpbb_notifications]([notification_type_id], [item_id]) ON [PRIMARY] GO CREATE INDEX [user] ON [phpbb_notifications]([user_id], [notification_read]) ON [PRIMARY] |