Fix insert/update/delete helper functions for oracle
This commit is contained in:
parent
f6284bdce7
commit
55efe1e56c
|
@ -87,6 +87,7 @@ class OC_DB {
|
||||||
'driver' => 'pdo_sqlite',
|
'driver' => 'pdo_sqlite',
|
||||||
);
|
);
|
||||||
$connectionParams['adapter'] = '\OC\DB\AdapterSqlite';
|
$connectionParams['adapter'] = '\OC\DB\AdapterSqlite';
|
||||||
|
$connectionParams['wrapperClass'] = 'OC\DB\Connection';
|
||||||
break;
|
break;
|
||||||
case 'mysql':
|
case 'mysql':
|
||||||
$connectionParams = array(
|
$connectionParams = array(
|
||||||
|
@ -99,6 +100,7 @@ class OC_DB {
|
||||||
'driver' => 'pdo_mysql',
|
'driver' => 'pdo_mysql',
|
||||||
);
|
);
|
||||||
$connectionParams['adapter'] = '\OC\DB\Adapter';
|
$connectionParams['adapter'] = '\OC\DB\Adapter';
|
||||||
|
$connectionParams['wrapperClass'] = 'OC\DB\Connection';
|
||||||
break;
|
break;
|
||||||
case 'pgsql':
|
case 'pgsql':
|
||||||
$connectionParams = array(
|
$connectionParams = array(
|
||||||
|
@ -110,6 +112,7 @@ class OC_DB {
|
||||||
'driver' => 'pdo_pgsql',
|
'driver' => 'pdo_pgsql',
|
||||||
);
|
);
|
||||||
$connectionParams['adapter'] = '\OC\DB\AdapterPgSql';
|
$connectionParams['adapter'] = '\OC\DB\AdapterPgSql';
|
||||||
|
$connectionParams['wrapperClass'] = 'OC\DB\Connection';
|
||||||
break;
|
break;
|
||||||
case 'oci':
|
case 'oci':
|
||||||
$connectionParams = array(
|
$connectionParams = array(
|
||||||
|
@ -124,6 +127,7 @@ class OC_DB {
|
||||||
$connectionParams['port'] = $port;
|
$connectionParams['port'] = $port;
|
||||||
}
|
}
|
||||||
$connectionParams['adapter'] = '\OC\DB\AdapterOCI8';
|
$connectionParams['adapter'] = '\OC\DB\AdapterOCI8';
|
||||||
|
$connectionParams['wrapperClass'] = 'OC\DB\OracleConnection';
|
||||||
$eventManager->addEventSubscriber(new \Doctrine\DBAL\Event\Listeners\OracleSessionInit);
|
$eventManager->addEventSubscriber(new \Doctrine\DBAL\Event\Listeners\OracleSessionInit);
|
||||||
break;
|
break;
|
||||||
case 'mssql':
|
case 'mssql':
|
||||||
|
@ -137,11 +141,11 @@ class OC_DB {
|
||||||
'driver' => 'pdo_sqlsrv',
|
'driver' => 'pdo_sqlsrv',
|
||||||
);
|
);
|
||||||
$connectionParams['adapter'] = '\OC\DB\AdapterSQLSrv';
|
$connectionParams['adapter'] = '\OC\DB\AdapterSQLSrv';
|
||||||
|
$connectionParams['wrapperClass'] = 'OC\DB\Connection';
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
$connectionParams['wrapperClass'] = 'OC\DB\Connection';
|
|
||||||
$connectionParams['tablePrefix'] = OC_Config::getValue('dbtableprefix', 'oc_' );
|
$connectionParams['tablePrefix'] = OC_Config::getValue('dbtableprefix', 'oc_' );
|
||||||
try {
|
try {
|
||||||
self::$connection = \Doctrine\DBAL\DriverManager::getConnection($connectionParams, $config, $eventManager);
|
self::$connection = \Doctrine\DBAL\DriverManager::getConnection($connectionParams, $config, $eventManager);
|
||||||
|
|
|
@ -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);
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue