From 400fc0f73d03010d3bf28d2b1db5d789dc085334 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 25 Dec 2017 18:49:31 +0100
Subject: [ticket/15055] Only drop dependent PK indexes and fix more tests for
 mssql

PHPBB3-15055
---
 tests/notification/fixtures/submit_post_notification.type.bookmark.xml | 2 ++
 tests/notification/fixtures/submit_post_notification.type.post.xml     | 3 +++
 .../fixtures/submit_post_notification.type.post_in_queue.xml           | 2 ++
 tests/notification/fixtures/submit_post_notification.type.quote.xml    | 2 ++
 tests/notification/fixtures/submit_post_notification.type.topic.xml    | 2 ++
 tests/notification/notification_test.php                               | 2 +-
 6 files changed, 12 insertions(+), 1 deletion(-)

(limited to 'tests/notification')

diff --git a/tests/notification/fixtures/submit_post_notification.type.bookmark.xml b/tests/notification/fixtures/submit_post_notification.type.bookmark.xml
index 7f069abc59..db1cef2ef6 100644
--- a/tests/notification/fixtures/submit_post_notification.type.bookmark.xml
+++ b/tests/notification/fixtures/submit_post_notification.type.bookmark.xml
@@ -29,6 +29,7 @@
 		</row>
 	</table>
 	<table name="phpbb_notifications">
+		<column>notification_id</column>
 		<column>notification_type_id</column>
 		<column>user_id</column>
 		<column>item_id</column>
@@ -36,6 +37,7 @@
 		<column>notification_read</column>
 		<column>notification_data</column>
 		<row>
+			<value>1</value>
 			<value>1</value>
 			<value>5</value>
 			<value>1</value>
diff --git a/tests/notification/fixtures/submit_post_notification.type.post.xml b/tests/notification/fixtures/submit_post_notification.type.post.xml
index a4bf9d3ee4..920b271525 100644
--- a/tests/notification/fixtures/submit_post_notification.type.post.xml
+++ b/tests/notification/fixtures/submit_post_notification.type.post.xml
@@ -21,6 +21,7 @@
 		</row>
 	</table>
 	<table name="phpbb_notifications">
+		<column>notification_id</column>
 		<column>notification_type_id</column>
 		<column>user_id</column>
 		<column>item_id</column>
@@ -28,6 +29,7 @@
 		<column>notification_read</column>
 		<column>notification_data</column>
 		<row>
+			<value>1</value>
 			<value>1</value>
 			<value>5</value>
 			<value>1</value>
@@ -36,6 +38,7 @@
 			<value></value>
 		</row>
 		<row>
+			<value>2</value>
 			<value>1</value>
 			<value>8</value>
 			<value>1</value>
diff --git a/tests/notification/fixtures/submit_post_notification.type.post_in_queue.xml b/tests/notification/fixtures/submit_post_notification.type.post_in_queue.xml
index 0a955c48d2..12e73b0ff2 100644
--- a/tests/notification/fixtures/submit_post_notification.type.post_in_queue.xml
+++ b/tests/notification/fixtures/submit_post_notification.type.post_in_queue.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <dataset>
 	<table name="phpbb_notifications">
+		<column>notification_id</column>
 		<column>notification_type_id</column>
 		<column>user_id</column>
 		<column>item_id</column>
@@ -8,6 +9,7 @@
 		<column>notification_read</column>
 		<column>notification_data</column>
 		<row>
+			<value>1</value>
 			<value>1</value>
 			<value>6</value>
 			<value>1</value>
diff --git a/tests/notification/fixtures/submit_post_notification.type.quote.xml b/tests/notification/fixtures/submit_post_notification.type.quote.xml
index c66830fbf5..9f4ba91475 100644
--- a/tests/notification/fixtures/submit_post_notification.type.quote.xml
+++ b/tests/notification/fixtures/submit_post_notification.type.quote.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <dataset>
 	<table name="phpbb_notifications">
+		<column>notification_id</column>
 		<column>notification_type_id</column>
 		<column>user_id</column>
 		<column>item_id</column>
@@ -8,6 +9,7 @@
 		<column>notification_read</column>
 		<column>notification_data</column>
 		<row>
+			<value>1</value>
 			<value>1</value>
 			<value>5</value>
 			<value>1</value>
diff --git a/tests/notification/fixtures/submit_post_notification.type.topic.xml b/tests/notification/fixtures/submit_post_notification.type.topic.xml
index e0f6583f48..1f96ed2ee7 100644
--- a/tests/notification/fixtures/submit_post_notification.type.topic.xml
+++ b/tests/notification/fixtures/submit_post_notification.type.topic.xml
@@ -21,6 +21,7 @@
 		</row>
 	</table>
 	<table name="phpbb_notifications">
+		<column>notification_id</column>
 		<column>notification_type_id</column>
 		<column>user_id</column>
 		<column>item_id</column>
@@ -28,6 +29,7 @@
 		<column>notification_read</column>
 		<column>notification_data</column>
 		<row>
+			<value>1</value>
 			<value>1</value>
 			<value>8</value>
 			<value>1</value>
diff --git a/tests/notification/notification_test.php b/tests/notification/notification_test.php
index ec42aa193c..6bbabfc602 100644
--- a/tests/notification/notification_test.php
+++ b/tests/notification/notification_test.php
@@ -108,7 +108,7 @@ class phpbb_notification_test extends phpbb_tests_notification_base
 		$types = array('notification.type.quote', 'notification.type.bookmark', 'notification.type.post', 'test');
 		foreach ($types as $id => $type)
 		{
-			$this->db->sql_query('INSERT INTO phpbb_notification_types ' .
+			$this->getConnection()->createQueryTable('insertNotification', 'INSERT INTO phpbb_notification_types ' .
 				$this->db->sql_build_array('INSERT', array(
 					'notification_type_id'		=> ($id + 1),
 					'notification_type_name'	=> $type,
-- 
cgit v1.2.1