Aaron Schulz [Wed, 28 Sep 2016 23:08:15 +0000 (16:08 -0700)]
Move DatabaseBase to a class alias for type-hints
Change-Id: Ib6bbbd751358cbc2f2d2767c80721d3d8f142c0d
jenkins-bot [Wed, 28 Sep 2016 22:41:39 +0000 (22:41 +0000)]
Merge "resourceloader: Disable ChronologyProtector to speed up wfGetLB()"
jenkins-bot [Wed, 28 Sep 2016 21:58:48 +0000 (21:58 +0000)]
Merge "rdbms: Lazy-init DatabaseDomain::getId()"
Timo Tijhof [Wed, 28 Sep 2016 21:01:04 +0000 (22:01 +0100)]
rdbms: Lazy-init DatabaseDomain::getId()
Follows-up
847b91b.
Noticed that in Xenon profiles, about 25% of Database::__construct
time is spent in array_map, via DatabaseDomain::convertToString.
* Database::__construct
* DatabaseDomain::__construct/convertToString/array_map
* DatabaseDomain::newUnspecified
* DatabaseDomain::__construct/convertToString/array_map
* DatabaseMysqlBase::open
* mysqli::*
Change-Id: Ib5ae7d1d03b27df504a7e5f552e36a0ca6fcf97e
jenkins-bot [Wed, 28 Sep 2016 21:31:33 +0000 (21:31 +0000)]
Merge "Parser: Allow `<s>` and `<strike>` in table of contents"
jenkins-bot [Wed, 28 Sep 2016 21:22:25 +0000 (21:22 +0000)]
Merge "Fix use of bogus $params var in FileBackend::__construct()"
jenkins-bot [Wed, 28 Sep 2016 21:12:49 +0000 (21:12 +0000)]
Merge "resourceloader: Avoid needless GPC normalisation"
Bartosz Dziewoński [Wed, 21 Sep 2016 19:59:56 +0000 (21:59 +0200)]
Parser: Allow `<s>` and `<strike>` in table of contents
Bug: T35715
Change-Id: Iec6a05e3e6bb622f477e6ebeb57e9f65da5f22bd
Aaron Schulz [Wed, 28 Sep 2016 20:25:21 +0000 (13:25 -0700)]
Fix use of bogus $params var in FileBackend::__construct()
Follows-up
81a0e79,
24aa72de,
dc522cf0.
Also set missing section name parameter in scopedProfileSection().
Bug: T146904
Change-Id: I897c21b766bfea4e4cb83c63f0e40e945bd73747
Timo Tijhof [Wed, 28 Sep 2016 20:37:20 +0000 (21:37 +0100)]
resourceloader: Disable ChronologyProtector to speed up wfGetLB()
For load.php requests, Xenon in Wikimedia production measures that half
the time for wfGetLB() is spent in ChronologyProtector::initPositions,
and its query to Memcached.
Change-Id: I24f90897e56fd679c6bd1acf764722ed58e51c67
jenkins-bot [Wed, 28 Sep 2016 20:03:38 +0000 (20:03 +0000)]
Merge "Use classes to apply the 'editfont' preference"
Translation updater bot [Wed, 28 Sep 2016 19:54:47 +0000 (21:54 +0200)]
Localisation updates from https://translatewiki.net.
Change-Id: Ia03a6db5b325c673887b1fc30ecc72e2312af23d
Volker E [Sat, 24 Sep 2016 03:08:55 +0000 (20:08 -0700)]
mediawiki.UI: Align buttons to design guidelines and OOjs UI
Aligning buttons to design guidelines in https://phabricator.wikimedia.org/M101
and to OOjs UI, similar to https://phabricator.wikimedia.org/rGOJUed9fef533bea
Additionally:
- aligning CSS code to MediaWiki Coding Guidelines,
- adding `transition`s equivalent to OOjs UI,
- replacing deprecated `@colorWhite` variable,
- replacing counter-intuitive `.button-colors()` Less mixin guard, given
our updated widget guidelines has only two primary button types
(`progressive` & `destructive`) left, with separate mixins and
- removing deprecated `constructive` CSS standalone selector and
corresponding KSS styleguide comments.
Bug: T146823
Change-Id: I6b9faefabc62689eabf6f4bccaa3d3756b5b662a
jenkins-bot [Wed, 28 Sep 2016 17:53:56 +0000 (17:53 +0000)]
Merge "Use HTTPS instead of HTTP for ietf.org URLs"
jenkins-bot [Wed, 28 Sep 2016 17:53:47 +0000 (17:53 +0000)]
Merge "Clean up use of UTSysop in TemporaryPasswordPrimaryAuthenticationProviderTest"
jenkins-bot [Wed, 28 Sep 2016 16:57:04 +0000 (16:57 +0000)]
Merge "Avoid DBPerformance warnings in ApiClearHasMsg"
Timo Tijhof [Wed, 28 Sep 2016 16:47:24 +0000 (17:47 +0100)]
resourceloader: Avoid needless GPC normalisation
Utility methods like getFuzzyBool already use getRawVal instead
of getVal (see
83df6d8). But there was still direct use of getVal
which meant we still pay for WebRequest normalisation in load.php.
ResourceLoaderContext::__construct's use of WebRequest::getVal
accounts for 0.12% of execution time according to a Xenon daily log
(2016-09-27.all.reversed.svgz). The total use of WebRequest::getVal
is 0.26% of execution time. So almost half of that comes from RL.
Change-Id: Id37619ceadb5c990abf83f7910104cbc95523d28
Fomafix [Tue, 27 Sep 2016 18:13:00 +0000 (20:13 +0200)]
Use HTTPS instead of HTTP for ietf.org URLs
http://tools.ietf.org/ redirects to https://tools.ietf.org/
Change-Id: Ia45d2ce80399e1c9172e0924abd6bf794a53122f
Brad Jorsch [Wed, 28 Sep 2016 14:32:34 +0000 (10:32 -0400)]
Clean up use of UTSysop in TemporaryPasswordPrimaryAuthenticationProviderTest
No idea what's causing T146498, but maybe this cleanup will fix it.
Note we can't clean up every use because we can't create test users from
data providers.
Bug: T146498
Change-Id: I5c7ea7f49ed42cb2ed36460afcf6aec30e9359de
Kunal Mehta [Wed, 28 Sep 2016 09:17:49 +0000 (02:17 -0700)]
Fix display of categories
Fixes regression from
1885a1ac462c08, which accidentally removed
page_namespace and page_title as select fields.
Bug: T146873
Change-Id: I19cff0cf5bc015da7311196749a9201a8e458b49
jenkins-bot [Wed, 28 Sep 2016 04:54:54 +0000 (04:54 +0000)]
Merge "Avoid DBPerformance log warnings in SpecialEditWatchlist"
jenkins-bot [Wed, 28 Sep 2016 04:46:54 +0000 (04:46 +0000)]
Merge "Fix "Incorrect watchlist token provided" unit test errors"
jenkins-bot [Wed, 28 Sep 2016 04:46:23 +0000 (04:46 +0000)]
Merge "resourceloader: Fix undefined getPrefixedText()"
Aaron Schulz [Sat, 24 Sep 2016 03:51:36 +0000 (20:51 -0700)]
Avoid DBPerformance log warnings in SpecialEditWatchlist
Change-Id: I97b31f5e805e9e3e4192d15195ff26ec416ad6b2
Timo Tijhof [Tue, 27 Sep 2016 18:03:48 +0000 (19:03 +0100)]
resourceloader: Fix undefined getPrefixedText()
Follows-up
dbe592df. Used to go in one-way only and silenced by
addObj(). Now that we're iterating directly as well, need a
conditional.
Bug: T146728
Change-Id: Ief9d44cc5cb8f5d687560f59cc696c5671546163
Aaron Schulz [Wed, 28 Sep 2016 04:18:34 +0000 (21:18 -0700)]
Fix "Incorrect watchlist token provided" unit test errors
Change-Id: Ib133ffe9b9ef438ff5716ad25a897e2c5a4f7d58
jenkins-bot [Wed, 28 Sep 2016 03:49:57 +0000 (03:49 +0000)]
Merge "Add @deprecated annotations to NS_IMAGE and NS_IMAGE_TALK"
Kunal Mehta [Wed, 28 Sep 2016 03:29:54 +0000 (20:29 -0700)]
Add @deprecated annotations to NS_IMAGE and NS_IMAGE_TALK
Hopefully this will discourage people from using them in new code.
Change-Id: I165a19406dfc0bcc471252e416480fa3af92d969
jenkins-bot [Wed, 28 Sep 2016 03:27:58 +0000 (03:27 +0000)]
Merge "Set ignore_user_abort( true ) during DB commit for sanity"
jenkins-bot [Wed, 28 Sep 2016 03:22:45 +0000 (03:22 +0000)]
Merge "Use getConnectionRef in WatchedItemStore"
addshore [Tue, 27 Sep 2016 14:19:17 +0000 (15:19 +0100)]
Use getConnectionRef in WatchedItemStore
Change-Id: Ica6fce8aeec08ace34cd23d3bb0390a859175e71
jenkins-bot [Wed, 28 Sep 2016 02:27:30 +0000 (02:27 +0000)]
Merge "Remove full form of ChangeTags::buildTagFilterSelector"
jenkins-bot [Wed, 28 Sep 2016 02:25:23 +0000 (02:25 +0000)]
Merge "Create ChangeTagsUpdate hook"
cenarium [Tue, 26 May 2015 00:50:42 +0000 (02:50 +0200)]
Create ChangeTagsUpdate hook
This creates a hook triggered when updating change tags, so that
extensions can take actions when tags are updated.
When tagging accompanies the action, the recent change is passed
while when tagging is subsequent to the action, the user who
performs the tagging is passed.
Bug: T118698
Change-Id: Ifb0cdc43252c4185e4f216d23b8a21fb31595a37
Aaron Schulz [Sat, 24 Sep 2016 01:52:21 +0000 (18:52 -0700)]
Lower $wgTrxProfilerLimits for JobRunner a bit
Jobs should always use query batching.
Change-Id: Iddbcc32b44e6c71feb66e2f52afb20e824e6eb72
Volker E [Tue, 27 Sep 2016 20:39:34 +0000 (13:39 -0700)]
mediawiki.UI: Align further greys to improved color palette
Aligning more of the base grey shades to improved color palette
https://phabricator.wikimedia.org/M82
Bug: T146799
Change-Id: I40d69e5fdb5456511be4884f947635179aaf1020
Kunal Mehta [Tue, 27 Sep 2016 21:50:13 +0000 (14:50 -0700)]
Make RecentChange::addTags() accept a string
Most planned callers of RecentChange::addTags() only want to add a
single tag, so forcing them to create an array seems unfriendly. Plus
this lets us avoid a array_merge call.
Change-Id: If001ba9ff01a33be158e7edd5c5e4de9825fa180
Ed Sanders [Wed, 7 Sep 2016 21:59:57 +0000 (14:59 -0700)]
Use classes to apply the 'editfont' preference
This class can be re-used on non textarea inputs
(e.g. ContentEditable or <input>).
The 'default' preference can't be achieved in CSS alone, so
for non-textarea cases, use 'monospace' as is used in the majority of
browsers/OSes. In future a client script could compute the default
font of textarea and add it to the -default rule.
Bug: T145015
Change-Id: I5f0433e9cae6f692396537412c11b79b61db062f
Translation updater bot [Tue, 27 Sep 2016 20:04:47 +0000 (22:04 +0200)]
Localisation updates from https://translatewiki.net.
Change-Id: Ieda6cba6bfc651c153cf87c9e89c1d3a8ef7f7d0
jenkins-bot [Tue, 27 Sep 2016 15:03:33 +0000 (15:03 +0000)]
Merge "Directly use Language::factory instead of wfGetLangObj"
jenkins-bot [Tue, 27 Sep 2016 14:28:22 +0000 (14:28 +0000)]
Merge "Avoid multiple writes to changetags table in recentchanges_save hook"
cenarium [Fri, 23 Sep 2016 14:36:48 +0000 (16:36 +0200)]
Avoid multiple writes to changetags table in recentchanges_save hook
Currently, extensions that add tags within the recentchanges_save
hook directly call ChangeTags::addTags. This often results in
consecutive writes to the changetags table.
This provides a addTags method to RecentChange so extensions
can simply use it when they want a tag added. And all the actual
tagging is done once at the end.
Change-Id: I8df2fd983c12632337e8d2922fa357808482338c
jenkins-bot [Tue, 27 Sep 2016 13:27:02 +0000 (13:27 +0000)]
Merge "Remove getSearchEngine() from DatabaseBase"
jenkins-bot [Tue, 27 Sep 2016 07:46:36 +0000 (07:46 +0000)]
Merge "Create fields & data for image/file data indexing"
Stanislav Malyshev [Wed, 14 Sep 2016 00:52:33 +0000 (17:52 -0700)]
Create fields & data for image/file data indexing
Bug: T145558
Change-Id: I23d4c8235d0e4150eefec31cea4b2cfdd32bf32a
jenkins-bot [Tue, 27 Sep 2016 04:31:47 +0000 (04:31 +0000)]
Merge "Clean up array() syntax in docs, part VII"
jenkins-bot [Tue, 27 Sep 2016 04:31:06 +0000 (04:31 +0000)]
Merge "Replace DatabaseBase:: with Database:: and update type hints"
Aaron Schulz [Mon, 26 Sep 2016 22:40:07 +0000 (15:40 -0700)]
Replace DatabaseBase:: with Database:: and update type hints
Change-Id: I3919b04eb2de4fa0bf8a02239fb5bbf17d347511
jenkins-bot [Tue, 27 Sep 2016 03:59:33 +0000 (03:59 +0000)]
Merge "EditPage: Allow language of copyright warning to be specified"
Alex Monk [Tue, 27 Sep 2016 00:23:21 +0000 (01:23 +0100)]
EditPage: Allow language of copyright warning to be specified
This avoids global state, and is necessary in places where the
global user language cannot be used, such as load.php.
Bug: T146686
Change-Id: I80a813a76b551643b68430e6a0ab553b2e1dfb11
Amir Sarabadani [Tue, 27 Sep 2016 03:15:08 +0000 (06:45 +0330)]
Clean up array() syntax in docs, part VII
Last part
Change-Id: I38f015e2122ef4fd2d2141718bd889794c29f06c
jenkins-bot [Tue, 27 Sep 2016 01:04:22 +0000 (01:04 +0000)]
Merge "Remove a few unused variables"
jenkins-bot [Tue, 27 Sep 2016 01:04:19 +0000 (01:04 +0000)]
Merge "Remove/actualize unused imports"
Max Semenik [Mon, 26 Sep 2016 23:38:15 +0000 (16:38 -0700)]
Remove a few unused variables
Change-Id: Ibfc4c6cbbc08b5917f1a84d86d2d4a0855e371a1
Max Semenik [Mon, 26 Sep 2016 23:25:17 +0000 (16:25 -0700)]
Remove/actualize unused imports
Change-Id: I6ef19d5d982aa45dbf5554107ad9ee720442f466
jenkins-bot [Mon, 26 Sep 2016 23:58:13 +0000 (23:58 +0000)]
Merge "Fix function name case"
Max Semenik [Mon, 26 Sep 2016 22:32:54 +0000 (15:32 -0700)]
Fix function name case
Change-Id: Ibd4f682d2ed8500a50d85aae38f17281646f7c2d
jenkins-bot [Mon, 26 Sep 2016 22:25:08 +0000 (22:25 +0000)]
Merge "AuthManager phpdoc cleanup"
Max Semenik [Mon, 26 Sep 2016 20:59:41 +0000 (13:59 -0700)]
AuthManager phpdoc cleanup
Change-Id: Ib6fa897e76ae479de68acaeb16708c2bdf15ae5f
Translation updater bot [Mon, 26 Sep 2016 20:05:23 +0000 (22:05 +0200)]
Localisation updates from https://translatewiki.net.
Change-Id: Id7ff13898d6a89d8ce88794666e940d7a6d94596
jenkins-bot [Mon, 26 Sep 2016 19:58:24 +0000 (19:58 +0000)]
Merge "Update wfEscapeShellArg() comments"
jenkins-bot [Mon, 26 Sep 2016 19:58:20 +0000 (19:58 +0000)]
Merge "Minor installer/upgrader cleanups"
jenkins-bot [Mon, 26 Sep 2016 18:54:19 +0000 (18:54 +0000)]
Merge "Change mid-upload 'cancel' button to 'back'"
jenkins-bot [Mon, 26 Sep 2016 17:34:00 +0000 (17:34 +0000)]
Merge "Add new type SearchIndexField::INDEX_TYPE_SHORT_TEXT"
jenkins-bot [Mon, 26 Sep 2016 17:14:52 +0000 (17:14 +0000)]
Merge "HTMLForm: Add HTMLDateTimeField"
Brad Jorsch [Thu, 22 Sep 2016 17:28:29 +0000 (13:28 -0400)]
HTMLForm: Add HTMLDateTimeField
And to do that, an OOUI PHP widget for
mw.widgets.datetime.DateTimeInputWidget too.
Bug: T146340
Change-Id: Iaa8b5892b6c3a1f3698cef59684cc3cdc9d483ea
jenkins-bot [Mon, 26 Sep 2016 15:30:54 +0000 (15:30 +0000)]
Merge "Avoid DB_MASTER use on password checks and defer password upgrades"
Matthias Mullie [Mon, 26 Sep 2016 13:58:21 +0000 (15:58 +0200)]
Change mid-upload 'cancel' button to 'back'
Bug: T114938
Change-Id: I5b430d772011ea37148452fb64627ada9ee9542c
cenarium [Fri, 23 Sep 2016 21:28:07 +0000 (23:28 +0200)]
Remove full form of ChangeTags::buildTagFilterSelector
This removes the full form option of ChangeTags::buildTagFilterSelector
since it is completely unused, either in core or extensions.
OOUI for tag selectors aren't implemented yet so the change in signature
shouldn't affect anything.
Change-Id: Ie97b77244b6a9596b53b562b71009686932cf97e
dcausse [Mon, 26 Sep 2016 10:50:23 +0000 (12:50 +0200)]
Add new type SearchIndexField::INDEX_TYPE_SHORT_TEXT
Useful for short technical strings such as mime types.
Change-Id: If440378f2b7004abed87eca4bbde767212c4b062
jenkins-bot [Mon, 26 Sep 2016 09:59:12 +0000 (09:59 +0000)]
Merge "Fix IDEA warning in FSFileBackend"
jenkins-bot [Mon, 26 Sep 2016 09:58:08 +0000 (09:58 +0000)]
Merge "Fix IDEA warnings in FileBackendStore"
jenkins-bot [Mon, 26 Sep 2016 09:58:05 +0000 (09:58 +0000)]
Merge "Use @lang tags for Lua scripts"
Translation updater bot [Sun, 25 Sep 2016 19:55:34 +0000 (21:55 +0200)]
Localisation updates from https://translatewiki.net.
Change-Id: Iee88cf7ca866040931ab75e85c27c6efa73aa1ff
Aaron Schulz [Sun, 25 Sep 2016 18:50:16 +0000 (11:50 -0700)]
Use @lang tags for Lua scripts
Change-Id: Ifdbff687539078b375330ebe3a1493b281e5c518
jenkins-bot [Sat, 24 Sep 2016 22:17:10 +0000 (22:17 +0000)]
Merge "Move RedisBagOStuff to /libs"
Aaron Schulz [Wed, 21 Sep 2016 23:13:14 +0000 (16:13 -0700)]
Move SwiftFileBackend to /libs
Change-Id: Ied0be9891d70930caf415d75cb3b89043347f47e
jenkins-bot [Sat, 24 Sep 2016 22:02:42 +0000 (22:02 +0000)]
Merge "Depedencency cleanups to SwiftFileBackend"
Translation updater bot [Sat, 24 Sep 2016 19:57:01 +0000 (21:57 +0200)]
Localisation updates from https://translatewiki.net.
Change-Id: I8e5eec2c2187060941e25a6b7388beccda6ee562
Aaron Schulz [Sat, 24 Sep 2016 10:55:38 +0000 (03:55 -0700)]
Fix IDEA warnings in FileBackendStore
Change-Id: Icd0fa697645c9a315f49f22216b669c5288c1176
Aaron Schulz [Sat, 24 Sep 2016 10:34:14 +0000 (03:34 -0700)]
Fix IDEA warning in FSFileBackend
Change-Id: Ia46bffabde91fb22df11cf953c0199995a41cb91
Fomafix [Sat, 24 Sep 2016 10:18:13 +0000 (12:18 +0200)]
Directly use Language::factory instead of wfGetLangObj
figureMessage always returns a valid language code.
Change-Id: Ifa11ca278e7a6f49781846bb6d1eec94669999f3
Aaron Schulz [Sat, 24 Sep 2016 06:03:56 +0000 (23:03 -0700)]
Set ignore_user_abort( true ) during DB commit for sanity
MediaWiki already does this in preOutputCommit(), but it should
also be in the DB layer.
Change-Id: I3193c236a7823f27938077b372887867aeaf78c5
Aaron Schulz [Sat, 24 Sep 2016 04:17:32 +0000 (21:17 -0700)]
Rename getSlavePos() => getReplicaPos()
All callers updated
Change-Id: Ieb87df1bd134e6b0d8b01be581288e98fe3543ee
Aaron Schulz [Fri, 23 Sep 2016 03:11:18 +0000 (20:11 -0700)]
Remove unused Database::isView()/clearViewsCache() methods
Also make getLazyMasterHandle() protected.
Change-Id: Id6b48ff976a800052c22e90b572695ab3b8beb7e
Aaron Schulz [Sat, 24 Sep 2016 03:28:21 +0000 (20:28 -0700)]
Avoid DBPerformance warnings in ApiClearHasMsg
Change-Id: I592d0718204376276b3508bf32b9dc446a05b351
Aaron Schulz [Sat, 24 Sep 2016 03:13:36 +0000 (20:13 -0700)]
Move RedisBagOStuff to /libs
Change-Id: Ia49fb044aacb44e53d36c80277783cd806aca439
Aaron Schulz [Wed, 21 Sep 2016 23:12:27 +0000 (16:12 -0700)]
Depedencency cleanups to SwiftFileBackend
* Avoid wf* function MediaWiki dependencies.
* Don't bother with getLocalClusterInstance() caching for the CLI case.
* Give FileBackend a default 'resetOutputBuffer' callback.
Change-Id: I359da1ad77c62880ea799b65cd3a16ad673a64eb
Aaron Schulz [Fri, 23 Sep 2016 03:42:38 +0000 (20:42 -0700)]
Minor installer/upgrader cleanups
Change-Id: I6352d16dce242c94203bdf7d020f1c0279fec6e5
jenkins-bot [Sat, 24 Sep 2016 01:33:14 +0000 (01:33 +0000)]
Merge "Move FSFilebackend and MemoryFileBackend to /libs"
jenkins-bot [Sat, 24 Sep 2016 01:13:44 +0000 (01:13 +0000)]
Merge "Make LoadBalancer return docs more specific about types"
Aaron Schulz [Fri, 23 Sep 2016 23:31:56 +0000 (16:31 -0700)]
Make LoadBalancer return docs more specific about types
Change-Id: Iab671b66a4a4da33c780b6d78752c484ec329254
Aaron Schulz [Sat, 24 Sep 2016 00:51:20 +0000 (17:51 -0700)]
Remove getSearchEngine() from DatabaseBase
Change-Id: I1d5f43a90c50ab8cf5b6e58f290751c3aec73c4e
jenkins-bot [Sat, 24 Sep 2016 00:23:05 +0000 (00:23 +0000)]
Merge "Clean up misuse of wfTimestampOrNull()"
Aaron Schulz [Wed, 21 Sep 2016 22:36:16 +0000 (15:36 -0700)]
Move FSFilebackend and MemoryFileBackend to /libs
Change-Id: Id38a2ef9e0e22537d0267b536f8a4dfd60c5b41d
Timo Tijhof [Fri, 23 Sep 2016 23:59:56 +0000 (00:59 +0100)]
Clean up misuse of wfTimestampOrNull()
It's primarily meant for nullable timestamps in the database.
And for the mere purpose of an is_null() check, it's more confusion
than useful to cause this function since in these two cases its return
value is not used as-is but further conditionalized.
* Also fix fragile link between getRegistration()'s false return
value never being passed to wfTimestamp (to mean "now") because
of the isLoggedIn() guard. The ternary would now make those
follow the 'else' branch toward null.
Change-Id: I9a1ee2a56e1767bfb750e27b1f37bdaeb5e6378d
Aaron Schulz [Fri, 23 Sep 2016 23:55:44 +0000 (16:55 -0700)]
Update wfEscapeShellArg() comments
Change-Id: Ib62a51186aee0967ba4420054ee69b83dcae4d59
jenkins-bot [Sat, 24 Sep 2016 00:01:13 +0000 (00:01 +0000)]
Merge "Remove wf* function usage from FSFileBackend"
jenkins-bot [Fri, 23 Sep 2016 23:41:20 +0000 (23:41 +0000)]
Merge "Avoid DatabaseBase type errors in setupDatabaseWithTestPrefix()"
Aaron Schulz [Fri, 23 Sep 2016 22:59:22 +0000 (15:59 -0700)]
Avoid DatabaseBase type errors in setupDatabaseWithTestPrefix()
Change-Id: I94cc0672a487d547a09c27997fe36274d7d62977