mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Conflicts:
	apps/user_ldap/lib/access.php
This commit is contained in:
Arthur Schiwon 2014-06-20 20:47:51 +02:00
parent d5819a5ecd
commit 93edacb357
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/user_ldap/lib/access.php
View File

@ -607,7 +607,7 @@ class Access extends LDAPUtility implements user\IUserTools {
$sqlAdjustment = ''; $sqlAdjustment = '';
$dbType = \OCP\Config::getSystemValue('dbtype'); $dbType = \OCP\Config::getSystemValue('dbtype');
if($dbType === 'mysql') { if($dbType === 'mysql' || $dbType == 'oci') {
$sqlAdjustment = 'FROM DUAL'; $sqlAdjustment = 'FROM DUAL';
} }

3
apps/user_ldap/lib/helper.php
View File

@ -159,7 +159,8 @@ class Helper {
return false; 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); $query = \OCP\DB::prepare('DELETE FROM '.$table);
} else { } else {
$query = \OCP\DB::prepare('TRUNCATE '.$table); $query = \OCP\DB::prepare('TRUNCATE '.$table);