From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 4 Jul 2018 07:20:53 +0000 (+0100)
Subject: Fix CONCAT assertions in some MCR tests
X-Git-Tag: 1.34.0-rc.0~4875
X-Git-Url: http://git.cyclocoop.org/data/Luca_Pacioli_%28Gemaelde%29.jpeg?a=commitdiff_plain;h=1da16f16393bdab712a89c8ad4f30948bd3c1e39;p=lhc%2Fweb%2Fwiklou.git

Fix CONCAT assertions in some MCR tests

Change-Id: I9507ae60751f8e9cc5e6205148cf2e37f67f42c5
---

diff --git a/tests/phpunit/includes/Storage/McrWriteBothRevisionStoreDbTest.php b/tests/phpunit/includes/Storage/McrWriteBothRevisionStoreDbTest.php
index c98414258a..f03d403e6a 100644
--- a/tests/phpunit/includes/Storage/McrWriteBothRevisionStoreDbTest.php
+++ b/tests/phpunit/includes/Storage/McrWriteBothRevisionStoreDbTest.php
@@ -159,8 +159,8 @@ class McrWriteBothRevisionStoreDbTest extends RevisionStoreDbTestBase {
 						'role_name' => $db->addQuotes( 'main' ),
 						'content_size' => 'slots.rev_len',
 						'content_sha1' => 'slots.rev_sha1',
-						'content_address' =>
-							'CONCAT(' . $db->addQuotes( 'tt:' ) . ',slots.rev_text_id)',
+						'content_address' => $db->buildConcat( [
+							$db->addQuotes( 'tt:' ), 'slots.rev_text_id' ] ),
 						'model_name' => 'slots.rev_content_model',
 					]
 				),
diff --git a/tests/phpunit/includes/Storage/NoContentModelRevisionStoreDbTest.php b/tests/phpunit/includes/Storage/NoContentModelRevisionStoreDbTest.php
index 2337805733..1d504deb79 100644
--- a/tests/phpunit/includes/Storage/NoContentModelRevisionStoreDbTest.php
+++ b/tests/phpunit/includes/Storage/NoContentModelRevisionStoreDbTest.php
@@ -156,7 +156,7 @@ class NoContentModelRevisionStoreDbTest extends RevisionStoreDbTestBase {
 						'content_size' => 'slots.rev_len',
 						'content_sha1' => 'slots.rev_sha1',
 						'content_address' =>
-							'CONCAT(' . $db->addQuotes( 'tt:' ) . ',slots.rev_text_id)',
+							$db->buildConcat( [ $db->addQuotes( 'tt:' ), 'slots.rev_text_id' ] ),
 						'model_name' => 'NULL',
 					]
 				),
diff --git a/tests/phpunit/includes/Storage/PreMcrRevisionStoreDbTest.php b/tests/phpunit/includes/Storage/PreMcrRevisionStoreDbTest.php
index a27d2bb29e..7cc3131831 100644
--- a/tests/phpunit/includes/Storage/PreMcrRevisionStoreDbTest.php
+++ b/tests/phpunit/includes/Storage/PreMcrRevisionStoreDbTest.php
@@ -130,7 +130,7 @@ class PreMcrRevisionStoreDbTest extends RevisionStoreDbTestBase {
 						'content_size' => 'slots.rev_len',
 						'content_sha1' => 'slots.rev_sha1',
 						'content_address' =>
-							'CONCAT(' . $db->addQuotes( 'tt:' ) . ',slots.rev_text_id)',
+							$db->buildConcat( [ $db->addQuotes( 'tt:' ), 'slots.rev_text_id' ] ),
 						'model_name' => 'slots.rev_content_model',
 					]
 				),