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

let insertIfNotExist() throw the native DBALException - no need to hide the real exception

remotes/origin/etag-endpoint
Thomas Müller 2015-03-09 22:12:31 +07:00
parent b966a4eb17
commit 89be55a672
8 changed files with 25 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/private/db.php
Unescape Escape View File

@ -20,8 +20,6 @@
*
*/
define('MDB2_SCHEMA_DUMP_STRUCTURE', '1');
/**
* This class manages the access to the database. It basically is a wrapper for
* Doctrine with some adaptions.
@ -40,8 +38,7 @@ class OC_DB {
*
* @return \OC\DB\MDB2SchemaManager
*/
private static function getMDB2SchemaManager()
{
private static function getMDB2SchemaManager() {
return new \OC\DB\MDB2SchemaManager(\OC::$server->getDatabaseConnection());
}
@ -166,16 +163,6 @@ class OC_DB {
return \OC::$server->getDatabaseConnection()->lastInsertId($table);
}
/**
* 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
* @return boolean number of updated rows
*/
public static function insertIfNotExist($table, $input, $compare = null) {
return \OC::$server->getDatabaseConnection()->insertIfNotExist($table, $input, $compare);
}
/**
* Start a transaction
*/
@ -205,7 +192,7 @@ class OC_DB {
*
* TODO: write more documentation
*/
public static function getDbStructure( $file, $mode = 0) {
public static function getDbStructure($file) {
$schemaManager = self::getMDB2SchemaManager();
return $schemaManager->getDbStructure($file);
}

17
lib/private/db/adapter.php
Unescape Escape View File

@ -43,7 +43,7 @@ class Adapter {
* insert the @input values when they do not exist yet
* @param string $table name
* @param array $input key->value pair, key has to be sanitized properly
* @throws \OC\HintException
* @throws \Doctrine\DBAL\DBALException
* @return int count of inserted rows
*/
public function insertIfNotExist($table, $input, $compare = null) {
@ -68,19 +68,6 @@ class Adapter {
$query = substr($query, 0, strlen($query) - 5);
$query .= ' HAVING COUNT(*) = 0';
try {
return $this->conn->executeUpdate($query, $inserts);
} 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);
$l = \OC::$server->getL10N('lib');
throw new \OC\HintException(
$l->t('Database Error'),
$l->t('Please contact your system administrator.'),
0,
$e
);
}
return $this->conn->executeUpdate($query, $inserts);
}
}

22
lib/private/db/adaptersqlite.php
Unescape Escape View File

@ -18,6 +18,13 @@ class AdapterSqlite extends Adapter {
return $statement;
}
/**
* @param string $table
* @param array $input
* @param null $compare
* @return int
* @throws \Doctrine\DBAL\DBALException
*/
public function insertIfNotExist($table, $input, $compare = null) {
if ($compare === null) {
$compare = array_keys($input);
@ -40,19 +47,6 @@ class AdapterSqlite extends Adapter {
$query = substr($query, 0, strlen($query) - 5);
$query .= ')';
try {
return $this->conn->executeUpdate($query, $inserts);
} 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);
$l = \OC::$server->getL10N('lib');
throw new \OC\HintException(
$l->t('Database Error'),
$l->t('Please contact your system administrator.'),
0,
$e
);
}
return $this->conn->executeUpdate($query, $inserts);
}
}

10
lib/private/db/connection.php
Unescape Escape View File

@ -152,16 +152,16 @@ class Connection extends \Doctrine\DBAL\Connection implements IDBConnection {
}
// internal use
public function realLastInsertId($seqName = null)
{
public function realLastInsertId($seqName = null) {
return parent::lastInsertId($seqName);
}
/**
* Insert a row if a matching row doesn't exists.
* Insert a row if a matching row does not exists.
* @param string $table. The table to insert into in the form '*PREFIX*tableName'
* @param array $input. An array of fieldname/value pairs
* @throws \OC\HintException
* @param array $input. An array of field name/value pairs
* @param array $compare
* @throws \Doctrine\DBAL\DBALException
* @return bool The return value from execute()
*/
public function insertIfNotExist($table, $input, $compare = null) {

2
lib/private/db/mdb2schemamanager.php
Unescape Escape View File

@ -35,7 +35,7 @@ class MDB2SchemaManager {
*
* TODO: write more documentation
*/
public function getDbStructure($file, $mode = MDB2_SCHEMA_DUMP_STRUCTURE) {
public function getDbStructure($file) {
return \OC_DB_MDB2SchemaWriter::saveSchemaToFile($file, $this->conn);
}

2
lib/public/db.php
Unescape Escape View File

@ -65,7 +65,7 @@ class DB {
*
*/
public static function insertIfNotExist($table, $input, $compare = null) {
return(\OC_DB::insertIfNotExist($table, $input, $compare));
return \OC::$server->getDatabaseConnection()->insertIfNotExist($table, $input, $compare);
}
/**

2
lib/public/idbconnection.php
Unescape Escape View File

@ -80,7 +80,7 @@ interface IDBConnection {
* Insert a row if a matching row doesn't exists.
* @param string $table The table name (will replace *PREFIX*) to perform the replace on.
* @param array $input
* @throws \OC\HintException
* @throws \Doctrine\DBAL\DBALException
*
* The input array if in the form:
*

10
tests/lib/db.php
Unescape Escape View File

@ -125,7 +125,7 @@ class Test_DB extends \Test\TestCase {
);
foreach($categoryEntries as $entry) {
$result = OC_DB::insertIfNotExist('*PREFIX*'.$this->table3,
$result = \OCP\DB::insertIfNotExist('*PREFIX*'.$this->table3,
array(
'uid' => $entry['user'],
'type' => $entry['type'],
@ -148,7 +148,7 @@ class Test_DB extends \Test\TestCase {
);
foreach($categoryEntries as $entry) {
$result = OC_DB::insertIfNotExist('*PREFIX*'.$this->table2,
$result = \OCP\DB::insertIfNotExist('*PREFIX*'.$this->table2,
array(
'addressbookid' => $entry['addressbookid'],
'fullname' => $entry['fullname'],
@ -180,7 +180,7 @@ class Test_DB extends \Test\TestCase {
$this->assertEquals($carddata, $rowset[0]['carddata']);
// Try to insert a new row
$result = OC_DB::insertIfNotExist('*PREFIX*'.$this->table2,
$result = \OCP\DB::insertIfNotExist('*PREFIX*'.$this->table2,
array(
'fullname' => $fullName,
'uri' => $uri,
@ -199,7 +199,7 @@ class Test_DB extends \Test\TestCase {
}
public function testInsertIfNotExistsViolating() {
$result = OC_DB::insertIfNotExist('*PREFIX*'.$this->table5,
$result = \OCP\DB::insertIfNotExist('*PREFIX*'.$this->table5,
array(
'storage' => 1,
'path_hash' => md5('welcome.txt'),
@ -207,7 +207,7 @@ class Test_DB extends \Test\TestCase {
));
$this->assertEquals(1, $result);
$result = OC_DB::insertIfNotExist('*PREFIX*'.$this->table5,
$result = \OCP\DB::insertIfNotExist('*PREFIX*'.$this->table5,
array(
'storage' => 1,
'path_hash' => md5('welcome.txt'),