sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix insert/update/delete helper functions for oracle

remotes/origin/stable6
Bart Visscher 2013-09-01 12:35:20 +07:00
parent f6284bdce7
commit 55efe1e56c
2 changed files with 55 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/db.php
Unescape Escape View File

@ -87,6 +87,7 @@ class OC_DB {
'driver' => 'pdo_sqlite',
);
$connectionParams['adapter'] = '\OC\DB\AdapterSqlite';
$connectionParams['wrapperClass'] = 'OC\DB\Connection';
break;
case 'mysql':
$connectionParams = array(
@ -99,6 +100,7 @@ class OC_DB {
'driver' => 'pdo_mysql',
);
$connectionParams['adapter'] = '\OC\DB\Adapter';
$connectionParams['wrapperClass'] = 'OC\DB\Connection';
break;
case 'pgsql':
$connectionParams = array(
@ -110,6 +112,7 @@ class OC_DB {
'driver' => 'pdo_pgsql',
);
$connectionParams['adapter'] = '\OC\DB\AdapterPgSql';
$connectionParams['wrapperClass'] = 'OC\DB\Connection';
break;
case 'oci':
$connectionParams = array(
@ -124,6 +127,7 @@ class OC_DB {
$connectionParams['port'] = $port;
}
$connectionParams['adapter'] = '\OC\DB\AdapterOCI8';
$connectionParams['wrapperClass'] = 'OC\DB\OracleConnection';
$eventManager->addEventSubscriber(new \Doctrine\DBAL\Event\Listeners\OracleSessionInit);
break;
case 'mssql':
@ -137,11 +141,11 @@ class OC_DB {
'driver' => 'pdo_sqlsrv',
);
$connectionParams['adapter'] = '\OC\DB\AdapterSQLSrv';
$connectionParams['wrapperClass'] = 'OC\DB\Connection';
break;
default:
return false;
}
$connectionParams['wrapperClass'] = 'OC\DB\Connection';
$connectionParams['tablePrefix'] = OC_Config::getValue('dbtableprefix', 'oc_' );
try {
self::$connection = \Doctrine\DBAL\DriverManager::getConnection($connectionParams, $config, $eventManager);

50
lib/db/oracleconnection.php
Unescape Escape View File

@ -0,0 +1,50 @@
<?php
/**
* Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
* This file is licensed under the Affero General Public License version 3 or
* later.
* See the COPYING-README file.
*/
namespace OC\DB;
class OracleConnection extends Connection {
/**
* Quote the keys of the array
*/
private function quoteKeys(array $data) {
$return = array();
foreach($data as $key => $value) {
$return[$this->quoteIdentifier($key)] = $value;
}
return $return;
}
/*
* (inherit docs)
*/
public function insert($tableName, array $data, array $types = array()) {
$tableName = $this->quoteIdentifier($tableName);
$data = $this->quoteKeys($data);
return parent::insert($tableName, $data, $types);
}
/*
* (inherit docs)
*/
public function update($tableName, array $data, array $identifier, array $types = array()) {
$tableName = $this->quoteIdentifier($tableName);
$data = $this->quoteKeys($data);
$identifier = $this->quoteKeys($identifier);
return parent::update($tableName, $data, $identifier, $types);
}
/*
* (inherit docs)
*/
public function delete($tableName, array $identifier) {
$tableName = $this->quoteIdentifier($tableName);
$identifier = $this->quoteKeys($identifier);
return parent::delete($tableName, $identifier);
}
}