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
Add missing empty lines between methods
[lhc/web/wiklou.git]
/
includes
/
CommentStore.php
diff --git
a/includes/CommentStore.php
b/includes/CommentStore.php
index
7a2726f
..
cba7a15
100644
(file)
--- a/
includes/CommentStore.php
+++ b/
includes/CommentStore.php
@@
-70,11
+70,7
@@
class CommentStore {
'deprecatedIn' => null,
],
'img_description' => [
'deprecatedIn' => null,
],
'img_description' => [
- 'table' => 'image_comment_temp',
- 'pk' => 'imgcomment_name',
- 'field' => 'imgcomment_description_id',
- 'joinPK' => 'img_name',
- 'stage' => MIGRATION_WRITE_NEW,
+ 'stage' => MIGRATION_NEW,
'deprecatedIn' => '1.32',
],
];
'deprecatedIn' => '1.32',
],
];
@@
-226,8
+222,14
@@
class CommentStore {
if ( $tempTableStage === MIGRATION_OLD ) {
$joinField = "{$alias}.{$t['field']}";
} else {
if ( $tempTableStage === MIGRATION_OLD ) {
$joinField = "{$alias}.{$t['field']}";
} else {
+ // Nothing hits this code path for now, but will in the future when we set
+ // $this->tempTables['rev_comment']['stage'] to MIGRATION_WRITE_NEW while
+ // merging revision_comment_temp into revision.
+ // @codeCoverageIgnoreStart
$joins[$alias][0] = 'LEFT JOIN';
$joinField = "(CASE WHEN {$key}_id != 0 THEN {$key}_id ELSE {$alias}.{$t['field']} END)";
$joins[$alias][0] = 'LEFT JOIN';
$joinField = "(CASE WHEN {$key}_id != 0 THEN {$key}_id ELSE {$alias}.{$t['field']} END)";
+ throw new LogicException( 'Nothing should reach this code path at this time' );
+ // @codeCoverageIgnoreEnd
}
} else {
$joinField = "{$key}_id";
}
} else {
$joinField = "{$key}_id";