Oracle doesn't know & as bitwise AND

Conflicts:
	lib/public/share.php

diff --git a/lib/public/share.php b/lib/public/share.php
index f40cd0d77fabcefa2721fd6ebde2bf03b49ab7b9..304cb7239eb92df2a531834a35f54f619dd75a97 100644 (file)
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -662,13 +662,15 @@ class Share {
                                        // Remove the permissions for all reshares of this item
                                        if (!empty($ids)) {
                                                $ids = "'".implode("','", $ids)."'";
-                                               // the binary operator & works on sqlite, mysql, postgresql and mssql
-                                               $sql = 'UPDATE `*PREFIX*share` SET `permissions` = `permissions` & ? WHERE `id` IN ('.$ids.')';
-                                               if (\OC_Config::getValue('dbtype', 'sqlite') === 'oci') {
-                                                       // guess which dbms does not handle & and uses a function for this
-                                                       $sql = 'UPDATE `*PREFIX*share` SET `permissions` = BITAND(`permissions`,?) WHERE `id` IN ('.$ids.')';
+                                               // TODO this should be done with Doctrine platform objects
+                                               if (\OC_Config::getValue( "dbtype") === 'oci') {
+                                                       $andOp = 'BITAND(`permissions`, ?)';
+                                               } else {
+                                                       $andOp = '`permissions` & ?';
                                                }
-                                               \OC_DB::executeAudited($sql, array($permissions));
+                                               $query = \OC_DB::prepare('UPDATE `*PREFIX*share` SET `permissions` = '.$andOp
+                                                       .' WHERE `id` IN ('.$ids.')');
+                                               $query->execute(array($permissions));
                                        }
                                }
                        }