upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-03-10 10:21:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge pull request #3650 from owncloud/use_to_char_for_oracle_clob_comparisons

Browse source 
use to_char to allow comparing string to CLOB cloumns in oracle
This commit is contained in:
Jörn Friedrich Dreyer 2013-06-11 05:34:55 -07:00
commit e238eeef6f
2 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/app.php
View file

@ -174,7 +174,8 @@ class OC_App{
$apps=array('files');
$sql = 'SELECT `appid` FROM `*PREFIX*appconfig`'
.' WHERE `configkey` = \'enabled\' AND `configvalue`=\'yes\'';
if (OC_Config::getValue( 'dbtype', 'sqlite' ) === 'oci') { //FIXME oracle hack
if (OC_Config::getValue( 'dbtype', 'sqlite' ) === 'oci') {
//FIXME oracle hack: need to explicitly cast CLOB to CHAR for comparison
$sql = 'SELECT `appid` FROM `*PREFIX*appconfig`'
.' WHERE `configkey` = \'enabled\' AND to_char(`configvalue`)=\'yes\'';
}

22
lib/connector/sabre/locks.php
View file

@ -45,7 +45,12 @@ class OC_Connector_Sabre_Locks extends Sabre_DAV_Locks_Backend_Abstract {
// but otherwise reading locks from SQLite Databases will return
// nothing
$query = 'SELECT * FROM `*PREFIX*locks`'
.' WHERE `userid` = ? AND (`created` + `timeout`) > '.time().' AND (( `uri` = ?)';
.' WHERE `userid` = ? AND (`created` + `timeout`) > '.time().' AND (( `uri` = ?)';
if (OC_Config::getValue( "dbtype") === 'oci') {
//FIXME oracle hack: need to explicitly cast CLOB to CHAR for comparison
$query = 'SELECT * FROM `*PREFIX*locks`'
.' WHERE `userid` = ? AND (`created` + `timeout`) > '.time().' AND (( to_char(`uri`) = ?)';
}
$params = array(OC_User::getUser(), $uri);
// We need to check locks for every part in the uri.
@ -60,15 +65,24 @@ class OC_Connector_Sabre_Locks extends Sabre_DAV_Locks_Backend_Abstract {
if ($currentPath) $currentPath.='/';
$currentPath.=$part;
$query.=' OR (`depth` != 0 AND `uri` = ?)';
//FIXME oracle hack: need to explicitly cast CLOB to CHAR for comparison
if (OC_Config::getValue( "dbtype") === 'oci') {
$query.=' OR (`depth` != 0 AND to_char(`uri`) = ?)';
} else {
$query.=' OR (`depth` != 0 AND `uri` = ?)';
}
$params[] = $currentPath;
}
if ($returnChildLocks) {
$query.=' OR (`uri` LIKE ?)';
//FIXME oracle hack: need to explicitly cast CLOB to CHAR for comparison
if (OC_Config::getValue( "dbtype") === 'oci') {
$query.=' OR (to_char(`uri`) LIKE ?)';
} else {
$query.=' OR (`uri` LIKE ?)';
}
$params[] = $uri . '/%';
}