From: Brad Jorsch <bjorsch@wikimedia.org>
Date: Mon, 23 Apr 2018 20:57:28 +0000 (-0400)
Subject: import: Don't try duplicate detection when the sha1 is unavailable
X-Git-Tag: 1.34.0-rc.0~5601^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22articles%22%2C%22id_article=%24ze_article%22%29%20.%20%22?a=commitdiff_plain;h=f09d66de2ab88e3ed39fc21b3805cea90eee5bfe;p=lhc%2Fweb%2Fwiklou.git

import: Don't try duplicate detection when the sha1 is unavailable

Trying to compare a string field with 0 (cast from false) raises an
error in PostgreSQL, and we're expecting it to not detect duplicates in
that situation anyway.

Change-Id: Ibff6daee6bbec00e37532e03c9ece041ba612de0
---

diff --git a/includes/import/ImportableOldRevisionImporter.php b/includes/import/ImportableOldRevisionImporter.php
index 33fad3e626..066a3eacef 100644
--- a/includes/import/ImportableOldRevisionImporter.php
+++ b/includes/import/ImportableOldRevisionImporter.php
@@ -68,18 +68,20 @@ class ImportableOldRevisionImporter implements OldRevisionImporter {
 
 			// Note: sha1 has been in XML dumps since 2012. If you have an
 			// older dump, the duplicate detection here won't work.
-			$prior = $dbw->selectField( 'revision', '1',
-				[ 'rev_page' => $pageId,
+			if ( $importableRevision->getSha1Base36() !== false ) {
+				$prior = $dbw->selectField( 'revision', '1',
+					[ 'rev_page' => $pageId,
 					'rev_timestamp' => $dbw->timestamp( $importableRevision->getTimestamp() ),
 					'rev_sha1' => $importableRevision->getSha1Base36() ],
-				__METHOD__
-			);
-			if ( $prior ) {
-				// @todo FIXME: This could fail slightly for multiple matches :P
-				$this->logger->debug( __METHOD__ . ": skipping existing revision for [[" .
-					$importableRevision->getTitle()->getPrefixedText() . "]], timestamp " .
-					$importableRevision->getTimestamp() . "\n" );
-				return false;
+					__METHOD__
+				);
+				if ( $prior ) {
+					// @todo FIXME: This could fail slightly for multiple matches :P
+					$this->logger->debug( __METHOD__ . ": skipping existing revision for [[" .
+						$importableRevision->getTitle()->getPrefixedText() . "]], timestamp " .
+						$importableRevision->getTimestamp() . "\n" );
+					return false;
+				}
 			}
 		}