summaryrefslogtreecommitdiffstats
path: root/lib/db.php
diff options
context:
space:
mode:
Diffstat (limited to 'lib/db.php')
-rw-r--r--lib/db.php557
1 files changed, 127 insertions, 430 deletions
diff --git a/lib/db.php b/lib/db.php
index 347deac8519..4a511908e5a 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -20,69 +20,51 @@
*
*/
-class DatabaseException extends Exception{
+define('MDB2_SCHEMA_DUMP_STRUCTURE', '1');
+
+class DatabaseException extends Exception {
private $query;
- public function __construct($message, $query){
+ public function __construct($message, $query) {
parent::__construct($message);
$this->query = $query;
}
- public function getQuery(){
+ public function getQuery() {
return $this->query;
}
}
/**
* This class manages the access to the database. It basically is a wrapper for
- * MDB2 with some adaptions.
+ * Doctrine with some adaptions.
*/
class OC_DB {
- const BACKEND_PDO=0;
- const BACKEND_MDB2=1;
+ const BACKEND_DOCTRINE=2;
static private $preparedQueries = array();
static private $cachingEnabled = true;
/**
- * @var MDB2_Driver_Common
+ * @var \Doctrine\DBAL\Connection
*/
- static private $connection; //the prefered connection to use, either PDO or MDB2
+ static private $connection; //the prefered connection to use, only Doctrine
static private $backend=null;
/**
- * @var MDB2_Driver_Common
- */
- static private $MDB2=null;
- /**
- * @var PDO
+ * @var Doctrine
*/
- static private $PDO=null;
- /**
- * @var MDB2_Schema
- */
- static private $schema=null;
+ static private $DOCTRINE=null;
+
static private $inTransaction=false;
static private $prefix=null;
static private $type=null;
/**
* check which backend we should use
- * @return int BACKEND_MDB2 or BACKEND_PDO
+ * @return int BACKEND_DOCTRINE
*/
private static function getDBBackend() {
- //check if we can use PDO, else use MDB2 (installation always needs to be done my mdb2)
- if(class_exists('PDO') && OC_Config::getValue('installed', false)) {
- $type = OC_Config::getValue( "dbtype", "sqlite" );
- if($type=='oci') { //oracle also always needs mdb2
- return self::BACKEND_MDB2;
- }
- if($type=='sqlite3') $type='sqlite';
- $drivers=PDO::getAvailableDrivers();
- if(array_search($type, $drivers)!==false) {
- return self::BACKEND_PDO;
- }
- }
- return self::BACKEND_MDB2;
+ return self::BACKEND_DOCTRINE;
}
/**
@@ -99,28 +81,24 @@ class OC_DB {
if(is_null($backend)) {
$backend=self::getDBBackend();
}
- if($backend==self::BACKEND_PDO) {
- $success = self::connectPDO();
- self::$connection=self::$PDO;
- self::$backend=self::BACKEND_PDO;
- }else{
- $success = self::connectMDB2();
- self::$connection=self::$MDB2;
- self::$backend=self::BACKEND_MDB2;
+ if($backend==self::BACKEND_DOCTRINE) {
+ $success = self::connectDoctrine();
+ self::$connection=self::$DOCTRINE;
+ self::$backend=self::BACKEND_DOCTRINE;
}
return $success;
}
/**
- * connect to the database using pdo
+ * connect to the database using doctrine
*
* @return bool
*/
- public static function connectPDO() {
+ public static function connectDoctrine() {
if(self::$connection) {
- if(self::$backend==self::BACKEND_MDB2) {
+ if(self::$backend!=self::BACKEND_DOCTRINE) {
self::disconnect();
- }else{
+ } else {
return true;
}
}
@@ -133,158 +111,55 @@ class OC_DB {
$type = OC_Config::getValue( "dbtype", "sqlite" );
if(strpos($host, ':')) {
list($host, $port)=explode(':', $host, 2);
- }else{
+ } else {
$port=false;
}
- $opts = array();
- $datadir=OC_Config::getValue( "datadirectory", OC::$SERVERROOT.'/data' );
// do nothing if the connection already has been established
- if(!self::$PDO) {
- // Add the dsn according to the database type
+ if(!self::$DOCTRINE) {
+ $config = new \Doctrine\DBAL\Configuration();
switch($type) {
case 'sqlite':
- $dsn='sqlite2:'.$datadir.'/'.$name.'.db';
- break;
case 'sqlite3':
- $dsn='sqlite:'.$datadir.'/'.$name.'.db';
- break;
- case 'mysql':
- if($port) {
- $dsn='mysql:dbname='.$name.';host='.$host.';port='.$port;
- }else{
- $dsn='mysql:dbname='.$name.';host='.$host;
- }
- $opts[PDO::MYSQL_ATTR_INIT_COMMAND] = "SET NAMES 'UTF8'";
- break;
- case 'pgsql':
- if($port) {
- $dsn='pgsql:dbname='.$name.';host='.$host.';port='.$port;
- }else{
- $dsn='pgsql:dbname='.$name.';host='.$host;
- }
- /**
- * Ugly fix for pg connections pbm when password use spaces
- */
- $e_user = addslashes($user);
- $e_password = addslashes($pass);
- $pass = $user = null;
- $dsn .= ";user='$e_user';password='$e_password'";
- /** END OF FIX***/
- break;
- case 'oci': // Oracle with PDO is unsupported
- if ($port) {
- $dsn = 'oci:dbname=//' . $host . ':' . $port . '/' . $name;
- } else {
- $dsn = 'oci:dbname=//' . $host . '/' . $name;
- }
- break;
- case 'mssql':
- if ($port) {
- $dsn='sqlsrv:Server='.$host.','.$port.';Database='.$name;
- } else {
- $dsn='sqlsrv:Server='.$host.';Database='.$name;
- }
- break;
- default:
- return false;
- }
- try{
- self::$PDO=new PDO($dsn, $user, $pass, $opts);
- }catch(PDOException $e) {
- OC_Log::write('core', $e->getMessage(), OC_Log::FATAL);
- OC_User::setUserId(null);
-
- // send http status 503
- header('HTTP/1.1 503 Service Temporarily Unavailable');
- header('Status: 503 Service Temporarily Unavailable');
- OC_Template::printErrorPage('Failed to connect to database');
- die();
- }
- // We always, really always want associative arrays
- self::$PDO->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_ASSOC);
- self::$PDO->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
- }
- return true;
- }
-
- /**
- * connect to the database using mdb2
- */
- public static function connectMDB2() {
- if(self::$connection) {
- if(self::$backend==self::BACKEND_PDO) {
- self::disconnect();
- }else{
- return true;
- }
- }
- self::$preparedQueries = array();
- // The global data we need
- $name = OC_Config::getValue( "dbname", "owncloud" );
- $host = OC_Config::getValue( "dbhost", "" );
- $user = OC_Config::getValue( "dbuser", "" );
- $pass = OC_Config::getValue( "dbpassword", "" );
- $type = OC_Config::getValue( "dbtype", "sqlite" );
- $SERVERROOT=OC::$SERVERROOT;
- $datadir=OC_Config::getValue( "datadirectory", "$SERVERROOT/data" );
-
- // do nothing if the connection already has been established
- if(!self::$MDB2) {
- // Require MDB2.php (not required in the head of the file so we only load it when needed)
- require_once 'MDB2.php';
-
- // Prepare options array
- $options = array(
- 'portability' => MDB2_PORTABILITY_ALL - MDB2_PORTABILITY_FIX_CASE,
- 'log_line_break' => '<br>',
- 'idxname_format' => '%s',
- 'debug' => true,
- 'quote_identifier' => true
- );
-
- // Add the dsn according to the database type
- switch($type) {
- case 'sqlite':
- case 'sqlite3':
- $dsn = array(
- 'phptype' => $type,
- 'database' => "$datadir/$name.db",
- 'mode' => '0644'
+ $datadir=OC_Config::getValue( "datadirectory", OC::$SERVERROOT.'/data' );
+ $connectionParams = array(
+ 'user' => $user,
+ 'password' => $pass,
+ 'path' => $datadir.'/'.$name.'.db',
+ 'driver' => 'pdo_sqlite',
);
break;
case 'mysql':
- $dsn = array(
- 'phptype' => 'mysql',
- 'username' => $user,
- 'password' => $pass,
- 'hostspec' => $host,
- 'database' => $name
+ $connectionParams = array(
+ 'user' => $user,
+ 'password' => $pass,
+ 'host' => $host,
+ 'port' => $port,
+ 'dbname' => $name,
+ 'charset' => 'UTF8',
+ 'driver' => 'pdo_mysql',
);
break;
case 'pgsql':
- $dsn = array(
- 'phptype' => 'pgsql',
- 'username' => $user,
- 'password' => $pass,
- 'hostspec' => $host,
- 'database' => $name
+ $connectionParams = array(
+ 'user' => $user,
+ 'password' => $pass,
+ 'host' => $host,
+ 'port' => $port,
+ 'dbname' => $name,
+ 'driver' => 'pdo_mysql',
);
break;
case 'oci':
- $dsn = array(
- 'phptype' => 'oci8',
- 'username' => $user,
+ $connectionParams = array(
+ 'user' => $user,
'password' => $pass,
+ 'host' => $host,
+ 'port' => $port,
+ 'dbname' => $name,
'charset' => 'AL32UTF8',
+ 'driver' => 'oci8',
);
- if ($host != '') {
- $dsn['hostspec'] = $host;
- $dsn['database'] = $name;
- } else { // use dbname for hostspec
- $dsn['hostspec'] = $name;
- $dsn['database'] = $user;
- }
break;
case 'mssql':
$dsn = array(
@@ -298,14 +173,10 @@ class OC_DB {
default:
return false;
}
-
- // Try to establish connection
- self::$MDB2 = MDB2::factory( $dsn, $options );
-
- // Die if we could not connect
- if( PEAR::isError( self::$MDB2 )) {
- OC_Log::write('core', self::$MDB2->getUserInfo(), OC_Log::FATAL);
- OC_Log::write('core', self::$MDB2->getMessage(), OC_Log::FATAL);
+ try {
+ self::$DOCTRINE = \Doctrine\DBAL\DriverManager::getConnection($connectionParams, $config);
+ } catch(\Doctrine\DBAL\DBALException $e) {
+ OC_Log::write('core', $e->getMessage(), OC_Log::FATAL);
OC_User::setUserId(null);
// send http status 503
@@ -314,12 +185,7 @@ class OC_DB {
OC_Template::printErrorPage('Failed to connect to database');
die();
}
-
- // We always, really always want associative arrays
- self::$MDB2->setFetchMode(MDB2_FETCHMODE_ASSOC);
}
-
- // we are done. great!
return true;
}
@@ -328,33 +194,28 @@ class OC_DB {
* @param string $query Query string
* @param int $limit
* @param int $offset
- * @return MDB2_Statement_Common prepared SQL query
+ * @return \Doctrine\DBAL\Statement prepared SQL query
*
- * SQL query via MDB2 prepare(), needs to be execute()'d!
+ * SQL query via Doctrine prepare(), needs to be execute()'d!
*/
static public function prepare( $query , $limit=null, $offset=null ) {
if (!is_null($limit) && $limit != -1) {
- if (self::$backend == self::BACKEND_MDB2) {
- //MDB2 uses or emulates limits & offset internally
- self::$MDB2->setLimit($limit, $offset);
+ //Doctrine does not handle limit and offset.
+ //FIXME: check limit notation for other dbs
+ //the following sql thus might needs to take into account db ways of representing it
+ //(oracle has no LIMIT / OFFSET)
+ $limit = (int)$limit;
+ $limitsql = ' LIMIT ' . $limit;
+ if (!is_null($offset)) {
+ $offset = (int)$offset;
+ $limitsql .= ' OFFSET ' . $offset;
+ }
+ //insert limitsql
+ if (substr($query, -1) == ';') { //if query ends with ;
+ $query = substr($query, 0, -1) . $limitsql . ';';
} else {
- //PDO does not handle limit and offset.
- //FIXME: check limit notation for other dbs
- //the following sql thus might needs to take into account db ways of representing it
- //(oracle has no LIMIT / OFFSET)
- $limit = (int)$limit;
- $limitsql = ' LIMIT ' . $limit;
- if (!is_null($offset)) {
- $offset = (int)$offset;
- $limitsql .= ' OFFSET ' . $offset;
- }
- //insert limitsql
- if (substr($query, -1) == ';') { //if query ends with ;
- $query = substr($query, 0, -1) . $limitsql . ';';
- } else {
- $query.=$limitsql;
- }
+ $query.=$limitsql;
}
} else {
if (isset(self::$preparedQueries[$query]) and self::$cachingEnabled) {
@@ -368,20 +229,13 @@ class OC_DB {
self::connect();
// return the result
- if(self::$backend==self::BACKEND_MDB2) {
- $result = self::$connection->prepare( $query );
-
- // Die if we have an error (error means: bad query, not 0 results!)
- if( PEAR::isError($result)) {
- throw new DatabaseException($result->getMessage(), $query);
- }
- }else{
- try{
+ if (self::$backend == self::BACKEND_DOCTRINE) {
+ try {
$result=self::$connection->prepare($query);
- }catch(PDOException $e) {
+ } catch(\Doctrine\DBAL\DBALException $e) {
throw new DatabaseException($e->getMessage(), $query);
}
- $result=new PDOStatementWrapper($result);
+ $result=new DoctrineStatementWrapper($result);
}
if ((is_null($limit) || $limit == -1) and self::$cachingEnabled ) {
$type = OC_Config::getValue( "dbtype", "sqlite" );
@@ -397,7 +251,7 @@ class OC_DB {
* @param string $table The optional table name (will replace *PREFIX*) and add sequence suffix
* @return int id
*
- * MDB2 lastInsertID()
+ * \Doctrine\DBAL\Connection lastInsertId
*
* Call this method right after the insert command or other functions may
* cause trouble!
@@ -416,7 +270,7 @@ class OC_DB {
$table = str_replace( '*PREFIX*', $prefix, $table );
}
return self::$connection->lastInsertId($table);
- }else{
+ } else {
if($table !== null) {
$prefix = OC_Config::getValue( "dbtableprefix", "oc_" );
$suffix = OC_Config::getValue( "dbsequencesuffix", "_id_seq" );
@@ -435,18 +289,14 @@ class OC_DB {
public static function disconnect() {
// Cut connection if required
if(self::$connection) {
- if(self::$backend==self::BACKEND_MDB2) {
- self::$connection->disconnect();
- }
self::$connection=false;
- self::$MDB2=false;
- self::$PDO=false;
+ self::$DOCTRINE=false;
}
return true;
}
- /**
+ /** else {
* @brief saves database scheme to xml file
* @param string $file name of file
* @param int $mode
@@ -455,18 +305,8 @@ class OC_DB {
* TODO: write more documentation
*/
public static function getDbStructure( $file, $mode=MDB2_SCHEMA_DUMP_STRUCTURE) {
- self::connectScheme();
-
- // write the scheme
- $definition = self::$schema->getDefinitionFromDatabase();
- $dump_options = array(
- 'output_mode' => 'file',
- 'output' => $file,
- 'end_of_line' => "\n"
- );
- self::$schema->dumpDatabase( $definition, $dump_options, $mode );
-
- return true;
+ self::connectDoctrine();
+ return OC_DB_Schema::getDbStructure(self::$connection, $file);
}
/**
@@ -477,22 +317,8 @@ class OC_DB {
* TODO: write more documentation
*/
public static function createDbFromStructure( $file ) {
- $CONFIG_DBNAME = OC_Config::getValue( "dbname", "owncloud" );
- $CONFIG_DBTABLEPREFIX = OC_Config::getValue( "dbtableprefix", "oc_" );
- $CONFIG_DBTYPE = OC_Config::getValue( "dbtype", "sqlite" );
-
- // cleanup the cached queries
- self::$preparedQueries = array();
-
- self::connectScheme();
-
- // read file
- $content = file_get_contents( $file );
-
- // Make changes and save them to an in-memory file
- $file2 = 'static://db_scheme';
- $content = str_replace( '*dbname*', $CONFIG_DBNAME, $content );
- $content = str_replace( '*dbprefix*', $CONFIG_DBTABLEPREFIX, $content );
+ self::connectDoctrine();
+ return OC_DB_Schema::createDbFromStructure(self::$connection, $file);
/* FIXME: use CURRENT_TIMESTAMP for all databases. mysql supports it as a default for DATETIME since 5.6.5 [1]
* as a fallback we could use <default>0000-01-01 00:00:00</default> everywhere
* [1] http://bugs.mysql.com/bug.php?id=27645
@@ -505,37 +331,6 @@ class OC_DB {
$content = str_replace( '<default>0000-00-00 00:00:00</default>',
'<default>CURRENT_TIMESTAMP</default>', $content );
}
-
- file_put_contents( $file2, $content );
-
- // Try to create tables
- $definition = self::$schema->parseDatabaseDefinitionFile( $file2 );
-
- //clean up memory
- unlink( $file2 );
-
- // Die in case something went wrong
- if( $definition instanceof MDB2_Schema_Error ) {
- OC_Template::printErrorPage( $definition->getMessage().': '.$definition->getUserInfo() );
- }
- if(OC_Config::getValue('dbtype', 'sqlite')==='oci') {
- unset($definition['charset']); //or MDB2 tries SHUTDOWN IMMEDIATE
- $oldname = $definition['name'];
- $definition['name']=OC_Config::getValue( "dbuser", $oldname );
- }
-
- // we should never drop a database
- $definition['overwrite'] = false;
-
- $ret=self::$schema->createDatabase( $definition );
-
- // Die in case something went wrong
- if( $ret instanceof MDB2_Error ) {
- OC_Template::printErrorPage( self::$MDB2->getDebugOutput().' '.$ret->getMessage() . ': '
- . $ret->getUserInfo() );
- }
-
- return true;
}
/**
@@ -544,27 +339,14 @@ class OC_DB {
* @return bool
*/
public static function updateDbFromStructure($file) {
- $CONFIG_DBTABLEPREFIX = OC_Config::getValue( "dbtableprefix", "oc_" );
- $CONFIG_DBTYPE = OC_Config::getValue( "dbtype", "sqlite" );
-
- self::connectScheme();
-
- // read file
- $content = file_get_contents( $file );
-
- $previousSchema = self::$schema->getDefinitionFromDatabase();
- if (PEAR::isError($previousSchema)) {
- $error = $previousSchema->getMessage();
- $detail = $previousSchema->getDebugInfo();
- $message = 'Failed to get existing database structure for updating ('.$error.', '.$detail.')';
- OC_Log::write('core', $message, OC_Log::FATAL);
- throw new Exception($message);
+ self::connectDoctrine();
+ try {
+ $result = OC_DB_Schema::updateDbFromStructure(self::$connection, $file);
+ } catch (Exception $e) {
+ OC_Log::write('core', 'Failed to update database structure ('.$e.')', OC_Log::FATAL);
+ throw $e;
}
-
- // Make changes and save them to an in-memory file
- $file2 = 'static://db_scheme';
- $content = str_replace( '*dbname*', $previousSchema['name'], $content );
- $content = str_replace( '*dbprefix*', $CONFIG_DBTABLEPREFIX, $content );
+ return $result;
/* FIXME: use CURRENT_TIMESTAMP for all databases. mysql supports it as a default for DATETIME since 5.6.5 [1]
* as a fallback we could use <default>0000-01-01 00:00:00</default> everywhere
* [1] http://bugs.mysql.com/bug.php?id=27645
@@ -577,48 +359,13 @@ class OC_DB {
$content = str_replace( '<default>0000-00-00 00:00:00</default>',
'<default>CURRENT_TIMESTAMP</default>', $content );
}
- file_put_contents( $file2, $content );
- $op = self::$schema->updateDatabase($file2, $previousSchema, array(), false);
-
- //clean up memory
- unlink( $file2 );
-
- if (PEAR::isError($op)) {
- $error = $op->getMessage();
- $detail = $op->getDebugInfo();
- $message = 'Failed to update database structure ('.$error.', '.$detail.')';
- OC_Log::write('core', $message, OC_Log::FATAL);
- throw new Exception($message);
- }
- return true;
- }
-
- /**
- * @brief connects to a MDB2 database scheme
- * @returns bool
- *
- * Connects to a MDB2 database scheme
- */
- private static function connectScheme() {
- // We need a mdb2 database connection
- self::connectMDB2();
- self::$MDB2->loadModule('Manager');
- self::$MDB2->loadModule('Reverse');
-
- // Connect if this did not happen before
- if(!self::$schema) {
- require_once 'MDB2/Schema.php';
- self::$schema=MDB2_Schema::factory(self::$MDB2);
- }
-
- return true;
}
/**
* @brief Insert a row if a matching row doesn't exists.
* @param string $table. The table to insert into in the form '*PREFIX*tableName'
* @param array $input. An array of fieldname/value pairs
- * @returns The return value from PDOStatementWrapper->execute()
+ * @returns The return value from DoctrineStatementWrapper->execute()
*/
public static function insertIfNotExist($table, $input) {
self::connect();
@@ -643,7 +390,7 @@ class OC_DB {
try {
$stmt = self::prepare($query);
$result = $stmt->execute();
- } catch(PDOException $e) {
+ } catch(\Doctrine\DBAL\DBALException $e) {
$entry = 'DB Error: "'.$e->getMessage() . '"<br />';
$entry .= 'Offending command was: ' . $query . '<br />';
OC_Log::write('core', $entry, OC_Log::FATAL);
@@ -675,7 +422,7 @@ class OC_DB {
try {
$result = self::prepare($query);
- } catch(PDOException $e) {
+ } catch(\Doctrine\DBAL\DBALException $e) {
$entry = 'DB Error: "'.$e->getMessage() . '"<br />';
$entry .= 'Offending command was: ' . $query.'<br />';
OC_Log::write('core', $entry, OC_Log::FATAL);
@@ -711,11 +458,11 @@ class OC_DB {
$query = str_replace( '`', '"', $query );
$query = str_ireplace( 'NOW()', 'datetime(\'now\')', $query );
$query = str_ireplace( 'UNIX_TIMESTAMP()', 'strftime(\'%s\',\'now\')', $query );
- }elseif( $type == 'pgsql' ) {
+ } elseif( $type == 'pgsql' ) {
$query = str_replace( '`', '"', $query );
$query = str_ireplace( 'UNIX_TIMESTAMP()', 'cast(extract(epoch from current_timestamp) as integer)',
$query );
- }elseif( $type == 'oci' ) {
+ } elseif( $type == 'oci' ) {
$query = str_replace( '`', '"', $query );
$query = str_ireplace( 'NOW()', 'CURRENT_TIMESTAMP', $query );
}elseif( $type == 'mssql' ) {
@@ -793,9 +540,8 @@ class OC_DB {
* @param string $tableName the table to drop
*/
public static function dropTable($tableName) {
- self::connectMDB2();
- self::$MDB2->loadModule('Manager');
- self::$MDB2->dropTable($tableName);
+ self::connectDoctrine();
+ OC_DB_Schema::dropTable(self::$connection, $tableName);
}
/**
@@ -803,28 +549,8 @@ class OC_DB {
* @param string $file the xml file describing the tables
*/
public static function removeDBStructure($file) {
- $CONFIG_DBNAME = OC_Config::getValue( "dbname", "owncloud" );
- $CONFIG_DBTABLEPREFIX = OC_Config::getValue( "dbtableprefix", "oc_" );
- self::connectScheme();
-
- // read file
- $content = file_get_contents( $file );
-
- // Make changes and save them to a temporary file
- $file2 = tempnam( get_temp_dir(), 'oc_db_scheme_' );
- $content = str_replace( '*dbname*', $CONFIG_DBNAME, $content );
- $content = str_replace( '*dbprefix*', $CONFIG_DBTABLEPREFIX, $content );
- file_put_contents( $file2, $content );
-
- // get the tables
- $definition = self::$schema->parseDatabaseDefinitionFile( $file2 );
-
- // Delete our temporary file
- unlink( $file2 );
- $tables=array_keys($definition['tables']);
- foreach($tables as $table) {
- self::dropTable($table);
- }
+ self::connectDoctrine();
+ OC_DB_Schema::removeDBStructure(self::$connection, $file);
}
/**
@@ -832,21 +558,8 @@ class OC_DB {
* @param $file string path to the MDB2 xml db export file
*/
public static function replaceDB( $file ) {
- $apps = OC_App::getAllApps();
- self::beginTransaction();
- // Delete the old tables
- self::removeDBStructure( OC::$SERVERROOT . '/db_structure.xml' );
-
- foreach($apps as $app) {
- $path = OC_App::getAppPath($app).'/appinfo/database.xml';
- if(file_exists($path)) {
- self::removeDBStructure( $path );
- }
- }
-
- // Create new tables
- self::createDBFromStructure( $file );
- self::commit();
+ self::connectDoctrine();
+ OC_DB_Schema::replaceDB(self::$connection, $file);
}
/**
@@ -855,9 +568,6 @@ class OC_DB {
*/
public static function beginTransaction() {
self::connect();
- if (self::$backend==self::BACKEND_MDB2 && !self::$connection->supports('transactions')) {
- return false;
- }
self::$connection->beginTransaction();
self::$inTransaction=true;
return true;
@@ -878,43 +588,36 @@ class OC_DB {
}
/**
- * check if a result is an error, works with MDB2 and PDOException
+ * check if a result is an error, works with Doctrine
* @param mixed $result
* @return bool
*/
public static function isError($result) {
if(!$result) {
return true;
- }elseif(self::$backend==self::BACKEND_MDB2 and PEAR::isError($result)) {
- return true;
- }else{
+ } else {
return false;
}
}
/**
* returns the error code and message as a string for logging
- * works with MDB2 and PDOException
+ * works with DoctrineException
* @param mixed $error
* @return string
*/
public static function getErrorMessage($error) {
- if ( self::$backend==self::BACKEND_MDB2 and PEAR::isError($error) ) {
- $msg = $error->getCode() . ': ' . $error->getMessage();
- if (defined('DEBUG') && DEBUG) {
- $msg .= '(' . $error->getDebugInfo() . ')';
- }
- } elseif (self::$backend==self::BACKEND_PDO and self::$PDO) {
- $msg = self::$PDO->errorCode() . ': ';
- $errorInfo = self::$PDO->errorInfo();
+ if (self::$backend==self::BACKEND_DOCTRINE and self::$DOCTRINE) {
+ $msg = self::$DOCTRINE->errorCode() . ': ';
+ $errorInfo = self::$DOCTRINE->errorInfo();
if (is_array($errorInfo)) {
$msg .= 'SQLSTATE = '.$errorInfo[0] . ', ';
$msg .= 'Driver Code = '.$errorInfo[1] . ', ';
$msg .= 'Driver Message = '.$errorInfo[2];
- }else{
+ } else {
$msg = '';
}
- }else{
+ } else {
$msg = '';
}
return $msg;
@@ -932,11 +635,11 @@ class OC_DB {
}
/**
- * small wrapper around PDOStatement to make it behave ,more like an MDB2 Statement
+ * small wrapper around \Doctrine\DBAL\Driver\Statement to make it behave, more like an MDB2 Statement
*/
-class PDOStatementWrapper{
+class DoctrineStatementWrapper {
/**
- * @var PDOStatement
+ * @var \Doctrine\DBAL\Driver\Statement
*/
private $statement=null;
private $lastArguments=array();
@@ -946,6 +649,20 @@ class PDOStatementWrapper{
}
/**
+ * pass all other function directly to the \Doctrine\DBAL\Driver\Statement
+ */
+ public function __call($name,$arguments) {
+ return call_user_func_array(array($this->statement,$name), $arguments);
+ }
+
+ /**
+ * provide numRows
+ */
+ public function numRows() {
+ return $this->statement->rowCount();
+ }
+
+ /**
* make execute return the result instead of a bool
*/
public function execute($input=array()) {
@@ -1063,19 +780,6 @@ class PDOStatementWrapper{
}
/**
- * provide numRows
- */
- public function numRows() {
- $regex = '/^SELECT\s+(?:ALL\s+|DISTINCT\s+)?(?:.*?)\s+FROM\s+(.*)$/i';
- if (preg_match($regex, $this->statement->queryString, $output) > 0) {
- $query = OC_DB::prepare("SELECT COUNT(*) FROM {$output[1]}", PDO::FETCH_NUM);
- return $query->execute($this->lastArguments)->fetchColumn();
- }else{
- return $this->statement->rowCount();
- }
- }
-
- /**
* provide an alias for fetch
*/
public function fetchRow() {
@@ -1083,13 +787,6 @@ class PDOStatementWrapper{
}
/**
- * pass all other function directly to the PDOStatement
- */
- public function __call($name, $arguments) {
- return call_user_func_array(array($this->statement, $name), $arguments);
- }
-
- /**
* Provide a simple fetchOne.
* fetch single column from the next row
* @param int $colnum the column number to fetch
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-14 08:35:58 +0000