Addshore has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/402367 )
Change subject: Set a default delimiter in Database::sourceStream
......................................................................
Set a default delimiter in Database::sourceStream
Discovered while debugging I7a4071072d802a82ecf7d16fbf8882ff8c79287f
DatabaseIntegration test alters the delimiter for the database instance
and it never gets set back.
Simply set the delimiter back to a default value at the start of
sourceSteam (for each new file pointer) which could have a new
delimiter.
Change-Id: Ib829b1c8d87271526fa6826910d40c304c778b32
---
M includes/libs/rdbms/database/Database.php
1 file changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/67/402367/1
diff --git a/includes/libs/rdbms/database/Database.php
b/includes/libs/rdbms/database/Database.php
index 15e02ad..863addb 100644
--- a/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@ -122,7 +122,9 @@
protected $preparedArgs;
/** @var string|bool|null Stashed value of html_errors INI setting */
protected $htmlErrors;
- /** @var string */
+ /** @var string Used by sourceStream to reset $delimiter */
+ protected $defaultDelimiter = ';';
+ /** @var string Used by and can be modified by streamStatementEnd() */
protected $delimiter = ';';
/** @var DatabaseDomain */
protected $currentDomain;
@@ -3391,6 +3393,7 @@
callable $inputCallback = null
) {
$cmd = '';
+ $this->delimiter = $this->defaultDelimiter;
while ( !feof( $fp ) ) {
if ( $lineCallback ) {
--
To view, visit https://gerrit.wikimedia.org/r/402367
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib829b1c8d87271526fa6826910d40c304c778b32
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Addshore <addshorew...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
