jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/339903 )
Change subject: Database: Remove weird commented-out block ...................................................................... Database: Remove weird commented-out block Commented out in 033b6b9646da6b71c5bb9dd6803a662bcf510a99 (r20329). After ten years, I think it's safe to bet this won't ever be getting un-commented. Change-Id: Ibb1f3e2969b2d81f6f2a17fff57e9b05cc17d58b --- M includes/libs/rdbms/database/Database.php M includes/libs/rdbms/database/DatabasePostgres.php 2 files changed, 2 insertions(+), 14 deletions(-) Approvals: jenkins-bot: Verified Jforrester: Looks good to me, approved diff --git a/includes/libs/rdbms/database/Database.php b/includes/libs/rdbms/database/Database.php index 1c5c77e..a7952a6 100644 --- a/includes/libs/rdbms/database/Database.php +++ b/includes/libs/rdbms/database/Database.php @@ -1141,12 +1141,6 @@ $preLimitTail .= $this->makeOrderBy( $options ); - // if (isset($options['LIMIT'])) { - // $tailOpts .= $this->limitResult('', $options['LIMIT'], - // isset($options['OFFSET']) ? $options['OFFSET'] - // : false); - // } - if ( isset( $noKeyOptions['FOR UPDATE'] ) ) { $postLimitTail .= ' FOR UPDATE'; } diff --git a/includes/libs/rdbms/database/DatabasePostgres.php b/includes/libs/rdbms/database/DatabasePostgres.php index 109f848..c62fec1 100644 --- a/includes/libs/rdbms/database/DatabasePostgres.php +++ b/includes/libs/rdbms/database/DatabasePostgres.php @@ -1079,8 +1079,8 @@ $q = <<<SQL SELECT 1 FROM pg_class, pg_namespace, pg_trigger WHERE relnamespace=pg_namespace.oid AND relkind='r' - AND tgrelid=pg_class.oid - AND nspname=%s AND relname=%s AND tgname=%s + AND tgrelid=pg_class.oid + AND nspname=%s AND relname=%s AND tgname=%s SQL; $res = $this->query( sprintf( @@ -1251,12 +1251,6 @@ $preLimitTail .= $this->makeGroupByWithHaving( $options ); $preLimitTail .= $this->makeOrderBy( $options ); - - // if ( isset( $options['LIMIT'] ) ) { - // $tailOpts .= $this->limitResult( '', $options['LIMIT'], - // isset( $options['OFFSET'] ) ? $options['OFFSET'] - // : false ); - // } if ( isset( $options['FOR UPDATE'] ) ) { $postLimitTail .= ' FOR UPDATE OF ' . -- To view, visit https://gerrit.wikimedia.org/r/339903 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibb1f3e2969b2d81f6f2a17fff57e9b05cc17d58b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Bartosz DziewoĆski <matma....@gmail.com> Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits