From 81b2ad158c272cd306ea35a9b44875a5c11e7135 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Tue, 30 Apr 2013 21:01:46 -0500
Subject: [PATCH] [ticket/11413] Use sql_insert_buffer

PHPBB3-11413
---
 .../db/migration/data/310/notifications2.php  | 27 ++++++-------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/phpBB/includes/db/migration/data/310/notifications2.php b/phpBB/includes/db/migration/data/310/notifications2.php
index cd078f8f60..44b3f8fd49 100644
--- a/phpBB/includes/db/migration/data/310/notifications2.php
+++ b/phpBB/includes/db/migration/data/310/notifications2.php
@@ -108,7 +108,7 @@ class phpbb_db_migration_data_310_notifications2 extends phpbb_db_migration
 			FROM ' . USERS_TABLE;
 		$result = $this->db->sql_query($sql);
 
-		$sql_insert_data = array();
+		$insert_buffer = new phpbb_db_sql_insert_buffer($this->db, $insert_table);
 		while ($row = $this->db->sql_fetchrow($result))
 		{
 			$notification_methods = array();
@@ -129,8 +129,8 @@ class phpbb_db_migration_data_310_notifications2 extends phpbb_db_migration
 			// Notifications for  posts
 			foreach (array('post', 'topic') as $item_type)
 			{
-				$sql_insert_data = $this->add_method_rows(
-					$sql_insert_data,
+				$this->add_method_rows(
+					$insert_buffer,
 					$item_type,
 					0,
 					$row['user_id'],
@@ -142,30 +142,21 @@ class phpbb_db_migration_data_310_notifications2 extends phpbb_db_migration
 			{
 				// Notifications for private messages
 				// User either gets all methods or no method
-				$sql_insert_data = $this->add_method_rows(
-					$sql_insert_data,
+				$this->add_method_rows(
+					$insert_buffer,
 					'pm',
 					0,
 					$row['user_id'],
 					$notification_methods
 				);
 			}
-
-			if (sizeof($sql_insert_data) > 500)
-			{
-				$this->db->sql_multi_insert($insert_table, $sql_insert_data);
-				$sql_insert_data = array();
-			}
 		}
 		$this->db->sql_freeresult($result);
 
-		if (!empty($sql_insert_data))
-		{
-			$this->db->sql_multi_insert($insert_table, $sql_insert_data);
-		}
+		$insert_buffer->flush();
 	}
 
-	protected function add_method_rows(array $sql_insert_data, $item_type, $item_id, $user_id, array $methods)
+	protected function add_method_rows(phpbb_db_sql_insert_buffer $insert_buffer, $item_type, $item_id, $user_id, array $methods)
 	{
 		$row_base = array(
 			'item_type'		=> $item_type,
@@ -176,9 +167,7 @@ class phpbb_db_migration_data_310_notifications2 extends phpbb_db_migration
 		foreach ($methods as $method)
 		{
 			$row_base['method'] = $method;
-			$sql_insert_data[] = $row_base;
+			$insert_buffer->insert($row_base);
 		}
-
-		return $sql_insert_data;
 	}
 }