Merge "ORMRow must not ignore failures on insert by deault."

diff --combined includes/db/ORMRow.php
index a8d0850,eaedb8b..affd65f
--- 1/includes/db/ORMRow.php
--- 2/includes/db/ORMRow.php
+++ b/includes/db/ORMRow.php
@@@ -263,8 -263,10 +263,10 @@@ abstract class ORMRow implements IORMRo
                                switch ( $type ) {
                                        case 'array':
                                                $value = (array)$value;
+                                               // fall-through!
                                        case 'blob':
                                                $value = serialize( $value );
+                                               // fall-through!
                                }
  
                                $values[$this->table->getPrefixedField( $name )] = $value;
@@@ -347,7 -349,7 +349,7 @@@
         * @return boolean Success indicator
         */
        protected function saveExisting( $functionName = null ) {
 -              $dbw = wfGetDB( DB_MASTER );
 +              $dbw = $this->table->getWriteDbConnection();
  
                $success = $dbw->update(
                        $this->table->getName(),
@@@ -356,8 -358,6 +358,8 @@@
                        is_null( $functionName ) ? __METHOD__ : $functionName
                );
  
 +              $this->table->releaseConnection( $dbw );
 +
                // DatabaseBase::update does not always return true for success as documented...
                return $success !== false;
        }
@@@ -385,13 -385,13 +387,13 @@@
         * @return boolean Success indicator
         */
        protected function insert( $functionName = null, array $options = null ) {
 -              $dbw = wfGetDB( DB_MASTER );
 +              $dbw = $this->table->getWriteDbConnection();
  
                $success = $dbw->insert(
                        $this->table->getName(),
                        $this->getWriteValues(),
                        is_null( $functionName ) ? __METHOD__ : $functionName,
-                       is_null( $options ) ? array( 'IGNORE' ) : $options
+                       $options
                );
  
                // DatabaseBase::insert does not always return true for success as documented...
@@@ -401,8 -401,6 +403,8 @@@
                        $this->setField( 'id', $dbw->insertId() );
                }
  
 +              $this->table->releaseConnection( $dbw );
 +
                return $success;
        }
  
@@@ -562,7 -560,7 +564,7 @@@
                $absoluteAmount = abs( $amount );
                $isNegative = $amount < 0;
  
 -              $dbw = wfGetDB( DB_MASTER );
 +              $dbw = $this->table->getWriteDbConnection();
  
                $fullField = $this->table->getPrefixedField( $field );
  
@@@ -577,8 -575,6 +579,8 @@@
                        $this->setField( $field, $this->getField( $field ) + $amount );
                }
  
 +              $this->table->releaseConnection( $dbw );
 +
                return $success;
        }