From: Siebrand Mazeland <siebrand@kitano.nl>
Date: Tue, 22 Apr 2014 20:23:01 +0000 (+0200)
Subject: Pass phpcs-strict on maintenance/oracle/
X-Git-Tag: 1.31.0-rc.0~16082^2
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dcompta/operations/modifier.php?a=commitdiff_plain;h=944349e0936fc500a94b85402a60913f96a1dd03;p=lhc%2Fweb%2Fwiklou.git

Pass phpcs-strict on maintenance/oracle/

Change-Id: I27b4de208d8d22f7f52817497e32ef9f008598e0
---

diff --git a/maintenance/oracle/alterSharedConstraints.php b/maintenance/oracle/alterSharedConstraints.php
index 435625d5b8..8f0b83f5c5 100644
--- a/maintenance/oracle/alterSharedConstraints.php
+++ b/maintenance/oracle/alterSharedConstraints.php
@@ -56,18 +56,21 @@ class AlterSharedConstraints extends Maintenance {
 				$ltable = "{$wgDBprefix}{$stable}";
 			}
 
-			$result = $dbw->query( "SELECT uc.constraint_name, uc.table_name, ucc.column_name, uccpk.table_name pk_table_name, uccpk.column_name pk_column_name, uc.delete_rule, uc.deferrable, uc.deferred
-					  FROM user_constraints uc, user_cons_columns ucc, user_cons_columns uccpk
-					 WHERE uc.constraint_type = 'R'
-					   AND ucc.constraint_name = uc.constraint_name
-					   AND uccpk.constraint_name = uc.r_constraint_name
-					   AND uccpk.table_name = '$ltable'" );
+			$result = $dbw->query( "SELECT uc.constraint_name, uc.table_name, ucc.column_name,
+						uccpk.table_name pk_table_name, uccpk.column_name pk_column_name,
+						uc.delete_rule, uc.deferrable, uc.deferred
+					FROM user_constraints uc, user_cons_columns ucc, user_cons_columns uccpk
+					WHERE uc.constraint_type = 'R'
+						AND ucc.constraint_name = uc.constraint_name
+						AND uccpk.constraint_name = uc.r_constraint_name
+						AND uccpk.table_name = '$ltable'" );
 			while ( ( $row = $result->fetchRow() ) !== false ) {
 
 					$this->output( "Altering {$row['constraint_name']} ..." );
 
 					try {
-						$dbw->query( "ALTER TABLE {$row['table_name']} DROP CONSTRAINT {$wgDBprefix}{$row['constraint_name']}" );
+						$dbw->query( "ALTER TABLE {$row['table_name']}
+							DROP CONSTRAINT {$wgDBprefix}{$row['constraint_name']}" );
 					} catch ( DBQueryError $exdb ) {
 						if ( $exdb->errno != 2443 ) {
 							throw $exdb;
@@ -75,7 +78,8 @@ class AlterSharedConstraints extends Maintenance {
 					}
 
 					$deleteRule = $row['delete_rule'] == 'NO ACTION' ? '' : "ON DELETE {$row['delete_rule']}";
-					$dbw->query( "ALTER TABLE {$row['table_name']} ADD CONSTRAINT {$wgDBprefix}{$row['constraint_name']}
+					$dbw->query( "ALTER TABLE {$row['table_name']}
+						ADD CONSTRAINT {$wgDBprefix}{$row['constraint_name']}
 						FOREIGN KEY ({$row['column_name']})
 						REFERENCES {$wgSharedDB}.$stable({$row['pk_column_name']})
 						{$deleteRule} {$row['deferrable']} INITIALLY {$row['deferred']}" );