Merge "(bug 37352) Boolean issue when using sqlite."

wikimedia · Mar 6, 2013 · 3933910 · 3933910
2 parents b7af187 + b9b3d88
commit 3933910
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/includes/db/ORMRow.php b/includes/db/ORMRow.php
@@ -509,11 +509,7 @@ public function setField( $name, $value ) {
 					$value = (float)$value;
 					break;
 				case 'bool':
-					if ( is_string( $value ) ) {
-						$value = $value !== '0';
-					} elseif ( is_int( $value ) ) {
-						$value = $value !== 0;
-					}
+					$value = (bool)$value;
 					break;
 				case 'array':
 					if ( is_string( $value ) ) {

diff --git a/tests/phpunit/includes/db/TestORMRowTest.php b/tests/phpunit/includes/db/TestORMRowTest.php
@@ -107,6 +107,22 @@ public function constructorTestProvider() {
 		);
 	}
 
+	/**
+	 * @since 1.21
+	 * @return array
+	 */
+	protected function getMockValues() {
+		return array(
+			'id' => 1,
+			'str' => 'foobar4645645',
+			'int' => 42,
+			'float' => 4.2,
+			'bool' => '',
+			'array' => array( 42, 'foobar' ),
+			'blob' => new stdClass()
+		);
+	}
+
 }
 
 class TestORMRow extends ORMRow {}