Backport subset of #4179, re-established Oracle compatibility for LDAP

Conflicts:
	apps/user_ldap/lib/access.php

diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index dc7e4f1239bad03c5b0fef3781d9af539b7cb9a4..d289627bead860a93db07a370920ad4ec53a66ee 100644 (file)
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -607,7 +607,7 @@ class Access extends LDAPUtility implements user\IUserTools {
 
                $sqlAdjustment = '';
                $dbType = \OCP\Config::getSystemValue('dbtype');
-               if($dbType === 'mysql') {
+               if($dbType === 'mysql' || $dbType == 'oci') {
                        $sqlAdjustment = 'FROM DUAL';
                }
 

diff --git a/apps/user_ldap/lib/helper.php b/apps/user_ldap/lib/helper.php
index 37caedc6251f089b3498bb5b33fde582c86ab432..b6d7bad87276a52b8fd562d3d7368e6bbb1f6932 100644 (file)
--- a/apps/user_ldap/lib/helper.php
+++ b/apps/user_ldap/lib/helper.php
@@ -159,7 +159,8 @@ class Helper {
                        return false;
                }
 
-               if(strpos(\OCP\Config::getSystemValue('dbtype'), 'sqlite') !== false) {
+               $dbtype = \OCP\Config::getSystemValue('dbtype');
+               if(strpos($dbtype, 'sqlite') !== false || $dbtype === 'oci') {
                        $query = \OCP\DB::prepare('DELETE FROM '.$table);
                } else {
                        $query = \OCP\DB::prepare('TRUNCATE '.$table);