Merge "Add options and join conds to MediaWikiTestCase::assertSelect"