dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rdbms: fix active GTID filtering in DatabaseMysqlBase
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
includes
/
libs
/
rdbms
/
database
/
DatabaseMysqlBaseTest.php
diff --git
a/tests/phpunit/includes/libs/rdbms/database/DatabaseMysqlBaseTest.php
b/tests/phpunit/includes/libs/rdbms/database/DatabaseMysqlBaseTest.php
index
b7dbe0b
..
6fff68f
100644
(file)
--- a/
tests/phpunit/includes/libs/rdbms/database/DatabaseMysqlBaseTest.php
+++ b/
tests/phpunit/includes/libs/rdbms/database/DatabaseMysqlBaseTest.php
@@
-316,8
+316,8
@@
class DatabaseMysqlBaseTest extends PHPUnit\Framework\TestCase {
* @dataProvider provideCommonDomainGTIDs
* @covers Wikimedia\Rdbms\MySQLMasterPos
*/
* @dataProvider provideCommonDomainGTIDs
* @covers Wikimedia\Rdbms\MySQLMasterPos
*/
- public function test
CommonGtidDomain
s( MySQLMasterPos $pos, MySQLMasterPos $ref, $gtids ) {
- $this->assertEquals( $gtids, MySQLMasterPos::get
CommonDomain
GTIDs( $pos, $ref ) );
+ public function test
GetRelevantActiveGTID
s( MySQLMasterPos $pos, MySQLMasterPos $ref, $gtids ) {
+ $this->assertEquals( $gtids, MySQLMasterPos::get
RelevantActive
GTIDs( $pos, $ref ) );
}
public static function provideCommonDomainGTIDs() {
}
public static function provideCommonDomainGTIDs() {
@@
-327,6
+327,12
@@
class DatabaseMysqlBaseTest extends PHPUnit\Framework\TestCase {
new MySQLMasterPos( '255-11-1000', 1 ),
[ '255-13-99' ]
],
new MySQLMasterPos( '255-11-1000', 1 ),
[ '255-13-99' ]
],
+ [
+ ( new MySQLMasterPos( '255-13-99,256-12-50,257-14-50', 1 ) )
+ ->setActiveDomain( 257 ),
+ new MySQLMasterPos( '255-11-1000,257-14-30', 1 ),
+ [ '257-14-50' ]
+ ],
[
new MySQLMasterPos(
'2E11FA47-71CA-11E1-9E33-C80AA9429562:1-5,' .
[
new MySQLMasterPos(
'2E11FA47-71CA-11E1-9E33-C80AA9429562:1-5,' .
@@
-672,7
+678,7
@@
class DatabaseMysqlBaseTest extends PHPUnit\Framework\TestCase {
$this->assertSame( 'CAST( fieldName AS SIGNED )', $output );
}
$this->assertSame( 'CAST( fieldName AS SIGNED )', $output );
}
- /*
+ /*
*
* @covers Wikimedia\Rdbms\Database::setIndexAliases
*/
public function testIndexAliases() {
* @covers Wikimedia\Rdbms\Database::setIndexAliases
*/
public function testIndexAliases() {