From: Bartosz Dziewoński <matma.rex@gmail.com>
Date: Sat, 25 Feb 2017 21:38:46 +0000 (+0100)
Subject: Database: Remove weird commented-out block
X-Git-Tag: 1.31.0-rc.0~3950^2~1
X-Git-Url: http://git.cyclocoop.org/%27-%20%20.%20url_absolue%28find_in_path%28%27spip_style.css%27%29%29%20%20%20.%20url_absolue%28find_in_path%28%27prive/spip_style.css%27%29%29%20.%20%27?a=commitdiff_plain;h=0da3d2ff2b78ef0cf3385e6e9e626ce1a7f4d3d6;p=lhc%2Fweb%2Fwiklou.git

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
---

diff --git a/includes/libs/rdbms/database/Database.php b/includes/libs/rdbms/database/Database.php
index 1c5c77e41c..a7952a6335 100644
--- a/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@ -1141,12 +1141,6 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
 
 		$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 109f8481d5..c62fec19db 100644
--- a/includes/libs/rdbms/database/DatabasePostgres.php
+++ b/includes/libs/rdbms/database/DatabasePostgres.php
@@ -1079,8 +1079,8 @@ __INDEXATTR__;
 		$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(
@@ -1252,12 +1252,6 @@ SQL;
 
 		$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 ' .
 				implode( ', ', array_map( [ $this, 'tableName' ], $options['FOR UPDATE'] ) );