[MediaWiki-commits] [Gerrit] mediawiki...FlaggedRevs[master]: Fix FlaggedRevision query

2017-11-17 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/392088 )

Change subject: Fix FlaggedRevision query
..


Fix FlaggedRevision query

It was missing needed join conditions.

Change-Id: I45b8c05b6564891c0c5c73ad1cf9ae48e627b2a5
---
M backend/FlaggedRevision.php
1 file changed, 4 insertions(+), 3 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/backend/FlaggedRevision.php b/backend/FlaggedRevision.php
index 0f86629..a536739 100644
--- a/backend/FlaggedRevision.php
+++ b/backend/FlaggedRevision.php
@@ -175,12 +175,13 @@
$frQuery['fields'],
[
'fp_page_id' => $pageId,
-   'fr_rev_id = fp_stable',
$db->bitAnd( 'rev_deleted', 
Revision::DELETED_TEXT ) . ' = 0', // sanity
],
__METHOD__,
$options,
-   $frQuery['joins']
+   [
+   'flaggedrevs' => [ 'JOIN', 'fr_rev_id = 
fp_stable' ],
+   ] + $frQuery['joins']
);
if ( $row ) {
$frev = new self( $row );
@@ -448,7 +449,7 @@
'rev_id = fr_rev_id',
'rev_page = fr_page_id', // sanity
] ],
-   ],
+   ] + $revQuery['joins'],
];
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/392088
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I45b8c05b6564891c0c5c73ad1cf9ae48e627b2a5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FlaggedRevs
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...FlaggedRevs[master]: Fix FlaggedRevision query

2017-11-17 Thread Anomie (Code Review) 
Anomie has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/392088 )

Change subject: Fix FlaggedRevision query
..

Fix FlaggedRevision query

It was missing needed join conditions.

Change-Id: I45b8c05b6564891c0c5c73ad1cf9ae48e627b2a5
---
M backend/FlaggedRevision.php
1 file changed, 4 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FlaggedRevs 
refs/changes/88/392088/1

diff --git a/backend/FlaggedRevision.php b/backend/FlaggedRevision.php
index 0f86629..a536739 100644
--- a/backend/FlaggedRevision.php
+++ b/backend/FlaggedRevision.php
@@ -175,12 +175,13 @@
$frQuery['fields'],
[
'fp_page_id' => $pageId,
-   'fr_rev_id = fp_stable',
$db->bitAnd( 'rev_deleted', 
Revision::DELETED_TEXT ) . ' = 0', // sanity
],
__METHOD__,
$options,
-   $frQuery['joins']
+   [
+   'flaggedrevs' => [ 'JOIN', 'fr_rev_id = 
fp_stable' ],
+   ] + $frQuery['joins']
);
if ( $row ) {
$frev = new self( $row );
@@ -448,7 +449,7 @@
'rev_id = fr_rev_id',
'rev_page = fr_page_id', // sanity
] ],
-   ],
+   ] + $revQuery['joins'],
];
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/392088
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I45b8c05b6564891c0c5c73ad1cf9ae48e627b2a5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FlaggedRevs
Gerrit-Branch: master
Gerrit-Owner: Anomie 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits