sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6512 from owncloud/master-failingoracletests 

Removed numRows usage from encryption app
remotes/origin/ldap_group_count
Vincent Petry 2013-12-19 08:22:44 +07:00
parent 079f1a6f41 963ee31efb
commit 06dec2632f
2 changed files with 19 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
apps/files_encryption/lib/util.php
Unescape Escape View File

@ -241,11 +241,9 @@ class Util {
if (\OCP\DB::isError($result)) { if (\OCP\DB::isError($result)) {
\OCP\Util::writeLog('Encryption library', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR); \OCP\Util::writeLog('Encryption library', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR);
} else { } else {
if ($result->numRows() > 0) { $row = $result->fetchRow();
$row = $result->fetchRow(); if ($row && isset($row['recovery_enabled'])) {
if (isset($row['recovery_enabled'])) { $recoveryEnabled[] = $row['recovery_enabled'];
$recoveryEnabled[] = $row['recovery_enabled'];
}
} }
} }
@ -289,7 +287,7 @@ class Util {
$sql = 'UPDATE `*PREFIX*encryption` SET `recovery_enabled` = ? WHERE `uid` = ?'; $sql = 'UPDATE `*PREFIX*encryption` SET `recovery_enabled` = ? WHERE `uid` = ?';
$args = array( $args = array(
$enabled, $enabled ? '1' : '0',
$this->userId $this->userId
); );
@ -971,8 +969,8 @@ class Util {
if (\OCP\DB::isError($result)) { if (\OCP\DB::isError($result)) {
\OCP\Util::writeLog('Encryption library', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR); \OCP\Util::writeLog('Encryption library', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR);
} else { } else {
if ($result->numRows() > 0) { $row = $result->fetchRow();
$row = $result->fetchRow(); if ($row) {
$path = substr($row['path'], strlen('files')); $path = substr($row['path'], strlen('files'));
} }
} }
@ -1252,11 +1250,9 @@ class Util {
if (\OCP\DB::isError($result)) { if (\OCP\DB::isError($result)) {
\OCP\Util::writeLog('Encryption library', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR); \OCP\Util::writeLog('Encryption library', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR);
} else { } else {
if ($result->numRows() > 0) { $row = $result->fetchRow();
$row = $result->fetchRow(); if ($row && isset($row['migration_status'])) {
if (isset($row['migration_status'])) { $migrationStatus[] = $row['migration_status'];
$migrationStatus[] = $row['migration_status'];
}
} }
} }
@ -1436,9 +1432,7 @@ class Util {
if (\OCP\DB::isError($result)) { if (\OCP\DB::isError($result)) {
\OCP\Util::writeLog('Encryption library', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR); \OCP\Util::writeLog('Encryption library', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR);
} else { } else {
if ($result->numRows() > 0) { $row = $result->fetchRow();
$row = $result->fetchRow();
}
} }
return $row; return $row;
@ -1462,9 +1456,7 @@ class Util {
if (\OCP\DB::isError($result)) { if (\OCP\DB::isError($result)) {
\OCP\Util::writeLog('Encryption library', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR); \OCP\Util::writeLog('Encryption library', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR);
} else { } else {
if ($result->numRows() > 0) { $row = $result->fetchRow();
$row = $result->fetchRow();
}
} }
return $row; return $row;
@ -1483,18 +1475,16 @@ class Util {
$result = $query->execute(array($id)); $result = $query->execute(array($id));
$source = array(); $source = null;
if (\OCP\DB::isError($result)) { if (\OCP\DB::isError($result)) {
\OCP\Util::writeLog('Encryption library', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR); \OCP\Util::writeLog('Encryption library', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR);
} else { } else {
if ($result->numRows() > 0) { $source = $result->fetchRow();
$source = $result->fetchRow();
}
} }
$fileOwner = false; $fileOwner = false;
if (isset($source['parent'])) { if ($source && isset($source['parent'])) {
$parent = $source['parent']; $parent = $source['parent'];
@ -1504,16 +1494,14 @@ class Util {
$result = $query->execute(array($parent)); $result = $query->execute(array($parent));
$item = array(); $item = null;
if (\OCP\DB::isError($result)) { if (\OCP\DB::isError($result)) {
\OCP\Util::writeLog('Encryption library', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR); \OCP\Util::writeLog('Encryption library', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR);
} else { } else {
if ($result->numRows() > 0) { $item = $result->fetchRow();
$item = $result->fetchRow();
}
} }
if (isset($item['parent'])) { if ($item && isset($item['parent'])) {
$parent = $item['parent']; $parent = $item['parent'];

4
apps/files_sharing/tests/base.php
Unescape Escape View File

@ -132,8 +132,8 @@ abstract class Test_Files_Sharing_Base extends \PHPUnit_Framework_TestCase {
$share = Null; $share = Null;
if ($result && $result->numRows() > 0) { if ($result) {
$share = $result->fetchRow(); $share = $result->fetchRow();
} }
return $share; return $share;