From 93edacb357ef0efa3a5beb4c12a369890a0cfd44 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 20 Jun 2014 20:47:51 +0200
Subject: [PATCH] Backport subset of #4179, re-established Oracle compatibility
for LDAP
Conflicts:
apps/user_ldap/lib/access.php
---
apps/user_ldap/lib/access.php | 2 +-
apps/user_ldap/lib/helper.php | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index dc7e4f1239..d289627bea 100644
--- 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 37caedc625..b6d7bad872 100644
--- 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);
--
GitLab