wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #7323 from owncloud/Jonny007-MKD-master

Browse source 
Update adapter.php
This commit is contained in:
Lukas Reschke 2014-09-09 11:31:50 +02:00
commit 353155b516
3 changed files with 41 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/private/db/adapter.php
View file

@ -51,13 +51,18 @@ class Adapter {
. str_repeat('?,', count($input)-1).'? ' // Is there a prettier alternative?
. 'FROM `' . $table . '` WHERE ';
$inserts = array_values($input);
foreach($input as $key => $value) {
$query .= '`' . $key . '` = ? AND ';
$query .= '`' . $key . '`';
if (is_null($value)) {
$query .= ' IS NULL AND ';
} else {
$inserts[] = $value;
$query .= ' = ? AND ';
}
}
$query = substr($query, 0, strlen($query) - 5);
$query .= ' HAVING COUNT(*) = 0';
$inserts = array_values($input);
$inserts = array_merge($inserts, $inserts);
try {
return $this->conn->executeUpdate($query, $inserts);

14
lib/private/db/adaptersqlite.php
View file

@ -21,13 +21,21 @@ class AdapterSqlite extends Adapter {
// NOTE: For SQLite we have to use this clumsy approach
// otherwise all fieldnames used must have a unique key.
$query = 'SELECT COUNT(*) FROM `' . $table . '` WHERE ';
foreach($input as $key => $value) {
$query .= '`' . $key . '` = ? AND ';
$inserts = array();
foreach ($input as $key => $value) {
$query .= '`' . $key . '`';
if (is_null($value)) {
$query .= ' IS NULL AND ';
} else {
$inserts[] = $value;
$query .= ' = ? AND ';
}
}
$query = substr($query, 0, strlen($query) - 5);
try {
$stmt = $this->conn->prepare($query);
$result = $stmt->execute(array_values($input));
$result = $stmt->execute($inserts);
} catch(\Doctrine\DBAL\DBALException $e) {
$entry = 'DB Error: "'.$e->getMessage() . '"<br />';
$entry .= 'Offending command was: ' . $query . '<br />';

22
tests/lib/db.php
View file

@ -125,6 +125,28 @@ class Test_DB extends PHPUnit_Framework_TestCase {
$this->assertEquals(4, count($result->fetchAll()));
}
public function testInsertIfNotExistNull() {
$categoryentries = array(
array('addressbookid' => 123, 'fullname' => null, 'expectedResult' => 1),
array('addressbookid' => 123, 'fullname' => null, 'expectedResult' => 0),
array('addressbookid' => 123, 'fullname' => 'test', 'expectedResult' => 1),
);
foreach($categoryentries as $entry) {
$result = OC_DB::insertIfNotExist('*PREFIX*'.$this->table2,
array(
'addressbookid' => $entry['addressbookid'],
'fullname' => $entry['fullname'],
));
$this->assertEquals($entry['expectedResult'], $result);
}
$query = OC_DB::prepare('SELECT * FROM `*PREFIX*'.$this->table2.'`');
$result = $query->execute();
$this->assertTrue((bool)$result);
$this->assertEquals(2, count($result->fetchAll()));
}
public function testinsertIfNotExistDontOverwrite() {
$fullname = 'fullname test';
$uri = 'uri_1';