From: Jörn Friedrich Dreyer <jfd@butonic.de>
Date: Tue, 11 Jun 2013 13:20:27 +0000 (-0700)
Subject: Merge pull request #3652 from owncloud/fix_fetchrow_usage_for_mdb2
X-Git-Tag: v6.0.0alpha2~659
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0eed1c980da1ea3d901d8e495c7a37bb5aac0cff;p=nextcloud-server.git

Merge pull request #3652 from owncloud/fix_fetchrow_usage_for_mdb2

fix fetchRow checks to also work with MDB2
---

0eed1c980da1ea3d901d8e495c7a37bb5aac0cff
diff --cc tests/lib/db.php
index 3c38acb558b,df390929978..afbdb413c3d
--- a/tests/lib/db.php
+++ b/tests/lib/db.php
@@@ -48,12 -48,9 +48,12 @@@ class Test_DB extends PHPUnit_Framework
  		$this->assertArrayHasKey('fullname', $row);
  		$this->assertEquals($row['fullname'], 'fullname test');
  		$row = $result->fetchRow();
- 		$this->assertFalse($row);
+ 		$this->assertFalse((bool)$row); //PDO returns false, MDB2 returns null
  	}
  
 +	/**
 +	 * @medium
 +	 */
  	public function testNOW() {
  		$query = OC_DB::prepare('INSERT INTO `*PREFIX*'.$this->table2.'` (`fullname`,`uri`) VALUES (NOW(),?)');
  		$result = $query->execute(array('uri_2'));