MrFredH has uploaded a new change for review. https://gerrit.wikimedia.org/r/68143
Change subject: Bugfix 47055: Modified Revision::fetchFromConds to fix a postgres related constraint, relating to select queries with FOR UPDATE clause, which Postgres objects to when the query contains a join. This is as described in https://bugzilla.wikimedia.org/show_ ...................................................................... Bugfix 47055: Modified Revision::fetchFromConds to fix a postgres related constraint, relating to select queries with FOR UPDATE clause, which Postgres objects to when the query contains a join. This is as described in https://bugzilla.wikimedia.org/show_bug.cgi?id=47055 Change-Id: I374a89949ac8696d107db0c4a1baf1091961dca3 --- M includes/Revision.php 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/43/68143/1 diff --git a/includes/Revision.php b/includes/Revision.php index b3b971b..be7b74f 100644 --- a/includes/Revision.php +++ b/includes/Revision.php @@ -353,6 +353,7 @@ * @return ResultWrapper */ private static function fetchFromConds( $db, $conditions, $flags = 0 ) { + global $wgDBtype; $fields = array_merge( self::selectFields(), self::selectPageFields(), @@ -360,7 +361,9 @@ ); $options = array( 'LIMIT' => 1 ); if ( ( $flags & self::READ_LOCKING ) == self::READ_LOCKING ) { - $options[] = 'FOR UPDATE'; + if( $wgDBtype != "postgres" ) { + $options[] = 'FOR UPDATE'; + } } return $db->select( array( 'revision', 'page', 'user' ), -- To view, visit https://gerrit.wikimedia.org/r/68143 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I374a89949ac8696d107db0c4a1baf1091961dca3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: MrFredH <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
