1 files changed, 40 insertions, 9 deletions

diff --git a/includes/ExternalStoreDB.php b/includes/ExternalStoreDB.php
index 9fa7d1b1..769c64da 100644
--- a/includes/ExternalStoreDB.php
+++ b/includes/ExternalStoreDB.php
@@ -26,24 +26,52 @@ $wgExternalBlobCache = array();
  */
 class ExternalStoreDB {
 
-	/** @todo Document.*/
+	function __construct( $params = array() ) {
+		$this->mParams = $params;
+	}
+
+	/**
+	 * Get a LoadBalancer for the specified cluster
+	 *
+	 * @param $cluster String: cluster name
+	 * @return LoadBalancer object
+	 */
 	function &getLoadBalancer( $cluster ) {
-		return wfGetLBFactory()->getExternalLB( $cluster );
+		$wiki = isset($this->mParams['wiki']) ? $this->mParams['wiki'] : false;
+		
+		return wfGetLBFactory()->getExternalLB( $cluster, $wiki );
 	}
 
-	/** @todo Document.*/
+	/**
+	 * Get a slave database connection for the specified cluster
+	 *
+	 * @param $cluster String: cluster name
+	 * @return DatabaseBase object
+	 */
 	function &getSlave( $cluster ) {
+		$wiki = isset($this->mParams['wiki']) ? $this->mParams['wiki'] : false;
 		$lb =& $this->getLoadBalancer( $cluster );
-		return $lb->getConnection( DB_SLAVE );
+		return $lb->getConnection( DB_SLAVE, array(), $wiki );
 	}
 
-	/** @todo Document.*/
+	/**
+	 * Get a master database connection for the specified cluster
+	 *
+	 * @param $cluster String: cluster name
+	 * @return DatabaseBase object
+	 */
 	function &getMaster( $cluster ) {
+		$wiki = isset($this->mParams['wiki']) ? $this->mParams['wiki'] : false;
 		$lb =& $this->getLoadBalancer( $cluster );
-		return $lb->getConnection( DB_MASTER );
+		return $lb->getConnection( DB_MASTER, array(), $wiki );
 	}
 
-	/** @todo Document.*/
+	/**
+	 * Get the 'blobs' table name for this database
+	 *
+	 * @param $db DatabaseBase
+	 * @return String: table name ('blobs' by default)
+	 */
 	function getTable( &$db ) {
 		$table = $db->getLBInfo( 'blobs table' );
 		if ( is_null( $table ) ) {
@@ -54,7 +82,7 @@ class ExternalStoreDB {
 
 	/**
 	 * Fetch data from given URL
-	 * @param string $url An url of the form DB://cluster/id or DB://cluster/id/itemid for concatened storage.
+	 * @param $url String: an url of the form DB://cluster/id or DB://cluster/id/itemid for concatened storage.
 	 */
 	function fetchFromURL( $url ) {
 		$path = explode( '/', $url );
@@ -128,8 +156,11 @@ class ExternalStoreDB {
 			array( 'blob_id' => $id, 'blob_text' => $data ), 
 			__METHOD__ );
 		$id = $dbw->insertId();
+		if ( !$id ) {
+			throw new MWException( __METHOD__.': no insert ID' );
+		}
 		if ( $dbw->getFlag( DBO_TRX ) ) {
-			$dbw->immediateCommit();
+			$dbw->commit();
 		}
 		return "DB://$cluster/$id";
 	}