[Pkg-owncloud-commits] [owncloud] 212/223: Backport subset of #4179, re-established Oracle compatibility for LDAP

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 93edacb357ef0efa3a5beb4c12a369890a0cfd44
Author: Arthur Schiwon <blizzz at owncloud.com>
Date:   Fri Jun 20 20:47:51 2014 +0200

    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 dc7e4f1..d289627 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 37caedc..b6d7bad 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);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git