Merge d3338b9142 into 4367bc8d11

PHPBB-17507

tests/notification/fixtures/email_notification.type.post.xml

@@ -164,14 +164,12 @@
 		</row>
 	</table>
 	<table name="phpbb_user_notifications">
-		<column>id</column>
 		<column>item_type</column>
 		<column>item_id</column>
 		<column>user_id</column>
 		<column>method</column>
 		<column>notify</column>
 		<row>
-			<value></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>2</value>
@@ -179,7 +177,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>3</value>
@@ -187,7 +184,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>4</value>
@@ -195,7 +191,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>5</value>
@@ -203,7 +198,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>6</value>
@@ -211,7 +205,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>7</value>
@@ -219,7 +212,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>8</value>
@@ -227,7 +219,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>2</value>
@@ -235,7 +226,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>3</value>
@@ -243,7 +233,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>4</value>
@@ -251,7 +240,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>5</value>
@@ -259,7 +247,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>6</value>
@@ -267,7 +254,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>7</value>
@@ -275,7 +261,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>8</value>

tests/notification/fixtures/submit_post_notification.type.bookmark.xml

@@ -119,14 +119,12 @@
 		</row>
 	</table>
 	<table name="phpbb_user_notifications">
-		<column>id</column>
 		<column>item_type</column>
 		<column>item_id</column>
 		<column>user_id</column>
 		<column>method</column>
 		<column>notify</column>
 		<row>
-			<value></value>
 			<value>notification.type.bookmark</value>
 			<value>0</value>
 			<value>2</value>
@@ -134,7 +132,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.bookmark</value>
 			<value>0</value>
 			<value>3</value>
@@ -142,7 +139,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.bookmark</value>
 			<value>0</value>
 			<value>4</value>
@@ -150,7 +146,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.bookmark</value>
 			<value>0</value>
 			<value>5</value>
@@ -158,7 +153,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.bookmark</value>
 			<value>0</value>
 			<value>6</value>
@@ -166,7 +160,6 @@
 			<value>0</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.bookmark</value>
 			<value>0</value>
 			<value>3</value>

tests/notification/fixtures/submit_post_notification.type.forum.xml

@@ -155,14 +155,12 @@
 		</row>
 	</table>
 	<table name="phpbb_user_notifications">
-		<column>id</column>
 		<column>item_type</column>
 		<column>item_id</column>
 		<column>user_id</column>
 		<column>method</column>
 		<column>notify</column>
 		<row>
-			<value></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>2</value>
@@ -170,7 +168,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>3</value>
@@ -178,7 +175,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>4</value>
@@ -186,7 +182,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>5</value>
@@ -194,7 +189,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>6</value>
@@ -202,7 +196,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>7</value>
@@ -210,7 +203,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>8</value>
@@ -218,7 +210,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>2</value>
@@ -226,7 +217,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>3</value>
@@ -234,7 +224,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>4</value>
@@ -242,7 +231,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>5</value>
@@ -250,7 +238,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>6</value>
@@ -258,7 +245,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>7</value>
@@ -266,7 +252,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>8</value>

tests/notification/fixtures/submit_post_notification.type.mention.xml

@@ -136,14 +136,12 @@
 		</row>
 	</table>
 	<table name="phpbb_user_notifications">
-		<column>id</column>
 		<column>item_type</column>
 		<column>item_id</column>
 		<column>user_id</column>
 		<column>method</column>
 		<column>notify</column>
 		<row>
-			<value></value>
 			<value>notification.type.mention</value>
 			<value>0</value>
 			<value>2</value>
@@ -151,7 +149,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.mention</value>
 			<value>0</value>
 			<value>3</value>
@@ -159,7 +156,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.mention</value>
 			<value>0</value>
 			<value>4</value>
@@ -167,7 +163,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.mention</value>
 			<value>0</value>
 			<value>5</value>
@@ -175,7 +170,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.mention</value>
 			<value>0</value>
 			<value>6</value>
@@ -183,7 +177,6 @@
 			<value>0</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.mention</value>
 			<value>0</value>
 			<value>8</value>

tests/notification/fixtures/submit_post_notification.type.post.xml

@@ -155,14 +155,12 @@
 		</row>
 	</table>
 	<table name="phpbb_user_notifications">
-		<column>id</column>
 		<column>item_type</column>
 		<column>item_id</column>
 		<column>user_id</column>
 		<column>method</column>
 		<column>notify</column>
 		<row>
-			<value></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>2</value>
@@ -170,7 +168,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>3</value>
@@ -178,7 +175,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>4</value>
@@ -186,7 +182,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>5</value>
@@ -194,7 +189,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>6</value>
@@ -202,7 +196,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>7</value>
@@ -210,7 +203,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>8</value>
@@ -218,7 +210,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>2</value>
@@ -226,7 +217,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>3</value>
@@ -234,7 +224,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>4</value>
@@ -242,7 +231,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>5</value>
@@ -250,7 +238,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>6</value>
@@ -258,7 +245,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>7</value>
@@ -266,7 +252,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>8</value>

tests/notification/fixtures/submit_post_notification.type.post_in_queue.xml

@@ -103,14 +103,12 @@
 		</row>
 	</table>
 	<table name="phpbb_user_notifications">
-		<column>id</column>
 		<column>item_type</column>
 		<column>item_id</column>
 		<column>user_id</column>
 		<column>method</column>
 		<column>notify</column>
 		<row>
-			<value></value>
 			<value>notification.type.needs_approval</value>
 			<value>0</value>
 			<value>2</value>
@@ -118,7 +116,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.needs_approval</value>
 			<value>0</value>
 			<value>3</value>
@@ -126,7 +123,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.needs_approval</value>
 			<value>0</value>
 			<value>4</value>
@@ -134,7 +130,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.needs_approval</value>
 			<value>0</value>
 			<value>5</value>
@@ -142,7 +137,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.needs_approval</value>
 			<value>0</value>
 			<value>6</value>
@@ -150,7 +144,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.needs_approval</value>
 			<value>0</value>
 			<value>7</value>
@@ -158,7 +151,6 @@
 			<value>0</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.needs_approval</value>
 			<value>0</value>
 			<value>9</value>

tests/notification/fixtures/submit_post_notification.type.quote.xml

@@ -91,14 +91,12 @@
 		</row>
 	</table>
 	<table name="phpbb_user_notifications">
-		<column>id</column>
 		<column>item_type</column>
 		<column>item_id</column>
 		<column>user_id</column>
 		<column>method</column>
 		<column>notify</column>
 		<row>
-			<value></value>
 			<value>notification.type.quote</value>
 			<value>0</value>
 			<value>2</value>
@@ -106,7 +104,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.quote</value>
 			<value>0</value>
 			<value>3</value>
@@ -114,7 +111,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.quote</value>
 			<value>0</value>
 			<value>4</value>
@@ -122,7 +118,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.quote</value>
 			<value>0</value>
 			<value>5</value>
@@ -130,7 +125,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.quote</value>
 			<value>0</value>
 			<value>6</value>

tests/notification/fixtures/submit_post_notification.type.topic.xml

@@ -99,14 +99,12 @@
 		</row>
 	</table>
 	<table name="phpbb_user_notifications">
-		<column>id</column>
 		<column>item_type</column>
 		<column>item_id</column>
 		<column>user_id</column>
 		<column>method</column>
 		<column>notify</column>
 		<row>
-			<value></value>
 			<value>notification.type.topic</value>
 			<value>0</value>
 			<value>2</value>
@@ -114,7 +112,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.topic</value>
 			<value>0</value>
 			<value>6</value>
@@ -122,7 +119,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.topic</value>
 			<value>0</value>
 			<value>7</value>
@@ -130,7 +126,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.topic</value>
 			<value>0</value>
 			<value>8</value>

tests/notification/fixtures/webpush_notification.type.post.xml

@@ -185,14 +185,12 @@
 		</row>
 	</table>
 	<table name="phpbb_user_notifications">
-		<column>id</column>
 		<column>item_type</column>
 		<column>item_id</column>
 		<column>user_id</column>
 		<column>method</column>
 		<column>notify</column>
 		<row>
-			<value></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>2</value>
@@ -200,7 +198,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>3</value>
@@ -208,7 +205,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>4</value>
@@ -216,7 +212,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>5</value>
@@ -224,7 +219,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>6</value>
@@ -232,7 +226,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>7</value>
@@ -240,7 +233,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>8</value>
@@ -248,7 +240,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>2</value>
@@ -256,7 +247,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>3</value>
@@ -264,7 +254,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>4</value>
@@ -272,7 +261,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>5</value>
@@ -280,7 +268,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>6</value>
@@ -288,7 +275,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>7</value>
@@ -296,7 +282,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>8</value>

tests/test_framework/phpbb_database_test_case.php

@@ -213,6 +213,10 @@ abstract class phpbb_database_test_case extends TestCase
 
 				if ($has_default_identity || $add_primary_keys)
 				{
+					// Enable implicit identity insert on mssql
+					$sql = "SET IDENTITY_INSERT $key OFF";
+					$db->sql_query($sql);
+
 					// Add default identity column to columns list
 					if ($has_default_identity)
 					{