Cleanup various calls to IDatabase::upsert()

Change-Id: Ic82154f6f62014f892a64e39b4fb6aed202f32eb

includes/Category.php

@@ -399,7 +399,7 @@ class Category {
 					'cat_subcats' => $result->subcats,
 					'cat_files' => $result->files
 				],
-				[ 'cat_title' ],
+				'cat_title',
 				[
 					'cat_pages' => $result->pages,
 					'cat_subcats' => $result->subcats,

includes/Pingback.php

@@ -101,7 +101,7 @@ class Pingback {
 		return $dbw->upsert(
 			'updatelog',
 			[ 'ul_key' => $this->key, 'ul_value' => $timestamp ],
-			[ 'ul_key' ],
+			'ul_key',
 			[ 'ul_value' => $timestamp ],
 			__METHOD__
 		);

includes/changetags/ChangeTags.php

@@ -935,7 +935,7 @@ class ChangeTags {
 		$dbw->upsert(
 			'change_tag_def',
 			$tagDef,
-			[ 'ctd_name' ],
+			'ctd_name',
 			[ 'ctd_user_defined' => 1 ],
 			__METHOD__
 		);

includes/page/WikiPage.php

@@ -1094,7 +1094,7 @@ class WikiPage implements Page, IDBAccessObject {
 					'rd_fragment' => $truncatedFragment,
 					'rd_interwiki' => $rt->getInterwiki(),
 				],
-				[ 'rd_from' ],
+				'rd_from',
 				[
 					'rd_namespace' => $rt->getNamespace(),
 					'rd_title' => $rt->getDBkey(),
@@ -3692,7 +3692,7 @@ class WikiPage implements Page, IDBAccessObject {
 				$dbw->upsert(
 					'category',
 					$insertRows,
-					[ 'cat_title' ],
+					'cat_title',
 					$addFields,
 					__METHOD__
 				);

maintenance/initUserPreference.php

@@ -58,16 +58,17 @@ class InitUserPreference extends Maintenance {
 		$processed = 0;
 		foreach ( $iterator as $batch ) {
 			foreach ( $batch as $row ) {
-				$values = [
-					'up_user' => $row->up_user,
-					'up_property' => $target,
-					'up_value' => $row->up_value,
-				];
 				$dbw->upsert(
 					'user_properties',
-					$values,
-					[ 'up_user', 'up_property' ],
-					$values,
+					[
+						'up_user' => $row->up_user,
+						'up_property' => $target,
+						'up_value' => $row->up_value,
+					],
+					[ [ 'up_user', 'up_property' ] ],
+					[
+						'up_value' => $row->up_value,
+					],
 					__METHOD__
 				);
 

maintenance/populateChangeTagDef.php

@@ -174,7 +174,7 @@ class PopulateChangeTagDef extends LoggedUpdateMaintenance {
 					'ctd_user_defined' => 0,
 					'ctd_count' => $row->hitcount
 				],
-				[ 'ctd_name' ],
+				'ctd_name',
 				[ 'ctd_count' => $row->hitcount ],
 				__METHOD__
 			);