Merge "Remove a bunch of trailing spaces and unneeded newlines"

diff --combined includes/db/ORMTable.php
index bcbf17f,39f16a0..e3a3434
--- 1/includes/db/ORMTable.php
--- 2/includes/db/ORMTable.php
+++ b/includes/db/ORMTable.php
@@@ -47,7 -47,7 +47,7 @@@ abstract class ORMTable implements IORM
        protected static $instanceCache = array();
  
        /**
 -       * The database connection to use for read operations.
 +       * ID of the database connection to use for read operations.
         * Can be changed via @see setReadDb.
         *
         * @since 1.20
@@@ -55,15 -55,6 +55,15 @@@
         */
        protected $readDb = DB_SLAVE;
  
 +      /**
 +       * The ID of any foreign wiki to use as a target for database operations,
 +       * or false to use the local wiki.
 +       *
 +       * @since 1.20
 +       * @var String|bool
 +       */
 +      protected $wiki = false;
 +
        /**
         * Returns a list of default field values.
         * field name => field value
@@@ -154,17 -145,13 +154,17 @@@
                        $fields = (array)$fields;
                }
  
 -              return wfGetDB( $this->getReadDb() )->select(
 +              $dbr = $this->getReadDbConnection();
 +              $result = $dbr->select(
                        $this->getName(),
                        $this->getPrefixedFields( $fields ),
                        $this->getPrefixedValues( $conditions ),
                        is_null( $functionName ) ? __METHOD__ : $functionName,
                        $options
                );
 +
 +              $this->releaseConnection( $dbr );
 +              return $result;
        }
  
        /**
@@@ -254,18 -241,15 +254,18 @@@
         */
        public function rawSelectRow( array $fields, array $conditions = array(),
                                                                  array $options = array(), $functionName = null ) {
 -              $dbr = wfGetDB( $this->getReadDb() );
 +              $dbr = $this->getReadDbConnection();
  
 -              return $dbr->selectRow(
 +              $result = $dbr->selectRow(
                        $this->getName(),
                        $fields,
                        $conditions,
                        is_null( $functionName ) ? __METHOD__ : $functionName,
                        $options
                );
 +
 +              $this->releaseConnection( $dbr );
 +              return $result;
        }
  
        /**
@@@ -343,18 -327,13 +343,18 @@@
         * @return boolean Success indicator
         */
        public function delete( array $conditions, $functionName = null ) {
 -              return wfGetDB( DB_MASTER )->delete(
 +              $dbw = $this->getWriteDbConnection();
 +
 +              $result = $dbw->delete(
                        $this->getName(),
                        $conditions === array() ? '*' : $this->getPrefixedValues( $conditions ),
                        $functionName
                ) !== false; // DatabaseBase::delete does not always return true for success as documented...
 +
 +              $this->releaseConnection( $dbw );
 +              return $result;
        }
-       
+ 
        /**
         * Get API parameters for the fields supported by this object.
         *
@@@ -418,7 -397,7 +418,7 @@@
        }
  
        /**
 -       * Get the database type used for read operations.
 +       * Get the database ID used for read operations.
         *
         * @since 1.20
         *
@@@ -429,7 -408,7 +429,7 @@@
        }
  
        /**
 -       * Set the database type to use for read operations.
 +       * Set the database ID to use for read operations, use DB_XXX constants or an index to the load balancer setup.
         *
         * @param integer $db
         *
@@@ -439,86 -418,6 +439,86 @@@
                $this->readDb = $db;
        }
  
 +      /**
 +       * Get the ID of the any foreign wiki to use as a target for database operations
 +       *
 +       * @since 1.20
 +       *
 +       * @return String|bool The target wiki, in a form that  LBFactory understands (or false if the local wiki is used)
 +       */
 +      public function getTargetWiki() {
 +              return $this->wiki;
 +      }
 +
 +      /**
 +       * Set the ID of the any foreign wiki to use as a target for database operations
 +       *
 +       * @param String|bool $wiki The target wiki, in a form that  LBFactory understands (or false if the local wiki shall be used)
 +       *
 +       * @since 1.20
 +       */
 +      public function setTargetWiki( $wiki ) {
 +              $this->wiki = $wiki;
 +      }
 +
 +      /**
 +       * Get the database type used for read operations.
 +       * This is to be used instead of wfGetDB.
 +       *
 +       * @see LoadBalancer::getConnection
 +       *
 +       * @since 1.20
 +       *
 +       * @return DatabaseBase The database object
 +       */
 +      public function getReadDbConnection() {
 +              return $this->getLoadBalancer()->getConnection( $this->getReadDb(), array(), $this->getTargetWiki() );
 +      }
 +
 +      /**
 +       * Get the database type used for read operations.
 +       * This is to be used instead of wfGetDB.
 +       *
 +       * @see LoadBalancer::getConnection
 +       *
 +       * @since 1.20
 +       *
 +       * @return DatabaseBase The database object
 +       */
 +      public function getWriteDbConnection() {
 +              return $this->getLoadBalancer()->getConnection( DB_MASTER, array(), $this->getTargetWiki() );
 +      }
 +
 +      /**
 +       * Get the database type used for read operations.
 +       *
 +       * @see wfGetLB
 +       *
 +       * @since 1.20
 +       *
 +       * @return LoadBalancer The database load balancer object
 +       */
 +      public function getLoadBalancer() {
 +              return wfGetLB( $this->getTargetWiki() );
 +      }
 +
 +      /**
 +       * Releases the lease on the given database connection. This is useful mainly
 +       * for connections to a foreign wiki. It does nothing for connections to the local wiki.
 +       *
 +       * @see LoadBalancer::reuseConnection
 +       *
 +       * @param DatabaseBase $db the database
 +       *
 +       * @since 1.20
 +       */
 +      public function releaseConnection( DatabaseBase $db ) {
 +              if ( $this->wiki !== false ) {
 +                      // recycle connection to foreign wiki
 +                      $this->getLoadBalancer()->reuseConnection( $db );
 +              }
 +      }
 +
        /**
         * Update the records matching the provided conditions by
         * setting the fields that are keys in the $values param to
@@@ -532,17 -431,14 +532,17 @@@
         * @return boolean Success indicator
         */
        public function update( array $values, array $conditions = array() ) {
 -              $dbw = wfGetDB( DB_MASTER );
 +              $dbw = $this->getWriteDbConnection();
  
 -              return $dbw->update(
 +              $result = $dbw->update(
                        $this->getName(),
                        $this->getPrefixedValues( $values ),
                        $this->getPrefixedValues( $conditions ),
                        __METHOD__
                ) !== false; // DatabaseBase::update does not always return true for success as documented...
 +
 +              $this->releaseConnection( $dbw );
 +              return $result;
        }
  
        /**
@@@ -554,7 -450,6 +554,7 @@@
         * @param array $conditions
         */
        public function updateSummaryFields( $summaryFields = null, array $conditions = array() ) {
 +              $slave = $this->getReadDb();
                $this->setReadDb( DB_MASTER );
  
                /**
@@@ -566,7 -461,7 +566,7 @@@
                        $item->save();
                }
  
 -              $this->setReadDb( DB_SLAVE );
 +              $this->setReadDb( $slave );
        }
  
        /**

diff --combined includes/installer/MysqlUpdater.php
index d787b5c,68a3922..c9ee446
--- 1/includes/installer/MysqlUpdater.php
--- 2/includes/installer/MysqlUpdater.php
+++ b/includes/installer/MysqlUpdater.php
@@@ -206,7 -206,6 +206,6 @@@ class MysqlUpdater extends DatabaseUpda
                        array( 'modifyField', 'user_groups', 'ug_group', 'patch-ug_group-length-increase.sql' ),
                        array( 'addField',      'uploadstash',  'us_chunk_inx',         'patch-uploadstash_chunk.sql' ),
                        array( 'addfield', 'job',           'job_timestamp',    'patch-jobs-add-timestamp.sql' ),
- 
                        array( 'modifyField', 'user_former_groups', 'ufg_group', 'patch-ufg_group-length-increase.sql' ),
  
                        // 1.20
@@@ -224,7 -223,6 +223,7 @@@
                        array( 'addField',      'page',     'page_content_model',               'patch-page-page_content_model.sql' ),
                        array( 'dropField', 'site_stats',   'ss_admins',        'patch-drop-ss_admins.sql' ),
                        array( 'dropField', 'recentchanges', 'rc_moved_to_title',            'patch-rc_moved.sql' ),
 +                      array( 'addTable', 'sites',                            'patch-sites.sql' ),
                );
        }
  

diff --combined includes/installer/SqliteUpdater.php
index eaec3d5,ab38055..6ec4706
--- 1/includes/installer/SqliteUpdater.php
--- 2/includes/installer/SqliteUpdater.php
+++ b/includes/installer/SqliteUpdater.php
@@@ -85,7 -85,6 +85,6 @@@ class SqliteUpdater extends DatabaseUpd
                        array( 'modifyField', 'user_groups', 'ug_group', 'patch-ug_group-length-increase.sql' ),
                        array( 'addField',      'uploadstash',  'us_chunk_inx',         'patch-uploadstash_chunk.sql' ),
                        array( 'addfield', 'job',           'job_timestamp',    'patch-jobs-add-timestamp.sql' ),
- 
                        array( 'modifyField', 'user_former_groups', 'ufg_group', 'patch-ug_group-length-increase.sql' ),
  
                        // 1.20
@@@ -104,7 -103,6 +103,7 @@@
  
                        array( 'dropField', 'site_stats',    'ss_admins',         'patch-drop-ss_admins.sql' ),
                        array( 'dropField', 'recentchanges', 'rc_moved_to_title', 'patch-rc_moved.sql' ),
 +                      array( 'addTable', 'sites',                            'patch-sites.sql' ),
                );
        }