Removed numRows usage from encryption app

numRows on Oracle always seem to return 0.

This fix removes numRows usage from the encryption and sharing app.

This fixes unit tests and potentially the encryption app itself
(migration status) when running on Oracle

diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index a3852312200e342b0b9cbcbcec38c75c5d41b1be..552ddc324c0c9bfad8afe52e09f4066924c226ed 100644 (file)
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -241,11 +241,9 @@ class Util {
                if (\OCP\DB::isError($result)) {
                        \OCP\Util::writeLog('Encryption library', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR);
                } else {
-                       if ($result->numRows() > 0) {
-                               $row = $result->fetchRow();
-                               if (isset($row['recovery_enabled'])) {
-                                       $recoveryEnabled[] = $row['recovery_enabled'];
-                               }
+                       $row = $result->fetchRow();
+                       if ($row && isset($row['recovery_enabled'])) {
+                               $recoveryEnabled[] = $row['recovery_enabled'];
                        }
                }
 
@@ -289,7 +287,7 @@ class Util {
                        $sql = 'UPDATE `*PREFIX*encryption` SET `recovery_enabled` = ? WHERE `uid` = ?';
 
                        $args = array(
-                               $enabled,
+                               $enabled ? '1' : '0',
                                $this->userId
                        );
 
@@ -944,8 +942,8 @@ class Util {
                if (\OCP\DB::isError($result)) {
                        \OCP\Util::writeLog('Encryption library', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR);
                } else {
-                       if ($result->numRows() > 0) {
-                               $row = $result->fetchRow();
+                       $row = $result->fetchRow();
+                       if ($row) {
                                $path = substr($row['path'], strlen('files'));
                        }
                }
@@ -1225,11 +1223,9 @@ class Util {
                if (\OCP\DB::isError($result)) {
                        \OCP\Util::writeLog('Encryption library', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR);
                } else {
-                       if ($result->numRows() > 0) {
-                               $row = $result->fetchRow();
-                               if (isset($row['migration_status'])) {
-                                       $migrationStatus[] = $row['migration_status'];
-                               }
+                       $row = $result->fetchRow();
+                       if ($row && isset($row['migration_status'])) {
+                               $migrationStatus[] = $row['migration_status'];
                        }
                }
 
@@ -1409,9 +1405,7 @@ class Util {
                if (\OCP\DB::isError($result)) {
                        \OCP\Util::writeLog('Encryption library', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR);
                } else {
-                       if ($result->numRows() > 0) {
-                               $row = $result->fetchRow();
-                       }
+                       $row = $result->fetchRow();
                }
 
                return $row;
@@ -1435,9 +1429,7 @@ class Util {
                if (\OCP\DB::isError($result)) {
                        \OCP\Util::writeLog('Encryption library', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR);
                } else {
-                       if ($result->numRows() > 0) {
-                               $row = $result->fetchRow();
-                       }
+                       $row = $result->fetchRow();
                }
 
                return $row;
@@ -1456,18 +1448,16 @@ class Util {
 
                $result = $query->execute(array($id));
 
-               $source = array();
+               $source = null;
                if (\OCP\DB::isError($result)) {
                        \OCP\Util::writeLog('Encryption library', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR);
                } else {
-                       if ($result->numRows() > 0) {
-                               $source = $result->fetchRow();
-                       }
+                       $source = $result->fetchRow();
                }
 
                $fileOwner = false;
 
-               if (isset($source['parent'])) {
+               if ($source && isset($source['parent'])) {
 
                        $parent = $source['parent'];
 
@@ -1477,16 +1467,14 @@ class Util {
 
                                $result = $query->execute(array($parent));
 
-                               $item = array();
+                               $item = null;
                                if (\OCP\DB::isError($result)) {
                                        \OCP\Util::writeLog('Encryption library', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR);
                                } else {
-                                       if ($result->numRows() > 0) {
-                                               $item = $result->fetchRow();
-                                       }
+                                       $item = $result->fetchRow();
                                }
 
-                               if (isset($item['parent'])) {
+                               if ($item && isset($item['parent'])) {
 
                                        $parent = $item['parent'];
 

diff --git a/apps/files_sharing/tests/base.php b/apps/files_sharing/tests/base.php
index 689c80cb9e642763dcf543c3a2bfe529db306190..3e283271f5d3d02d285e4923e2ab7d6463e5f206 100644 (file)
--- a/apps/files_sharing/tests/base.php
+++ b/apps/files_sharing/tests/base.php
@@ -132,8 +132,8 @@ abstract class Test_Files_Sharing_Base extends \PHPUnit_Framework_TestCase {
 
                $share = Null;
 
-               if ($result && $result->numRows() > 0) {
-                               $share = $result->fetchRow();
+               if ($result) {
+                       $share = $result->fetchRow();
                }
 
                return $share;