summaryrefslogtreecommitdiffstats
path: root/lib/db.php
diff options
context:
space:
mode:
authorJörn Friedrich Dreyer <jfd@butonic.de>2013-07-05 14:05:42 +0200
committerJörn Friedrich Dreyer <jfd@butonic.de>2013-07-05 14:05:42 +0200
commit00987feda1b9d4c4d19b41291275e00d5d519f9c (patch)
treec2c8142cd5d5e8adbd4a547002738da46b8cfb14 /lib/db.php
parentf3c4a37a78763df5481b01be936f73ca70426ed3 (diff)
downloadnextcloud-server-00987feda1b9d4c4d19b41291275e00d5d519f9c.tar.gz
nextcloud-server-00987feda1b9d4c4d19b41291275e00d5d519f9c.zip
fix insertIfNotExist return value, update doc and corresponding test
Diffstat (limited to 'lib/db.php')
-rw-r--r--lib/db.php7
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/db.php b/lib/db.php
index 4d6788f2bda..d5ef4248764 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -702,7 +702,7 @@ class OC_DB {
* @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 int number of updated rows
*/
public static function insertIfNotExist($table, $input) {
self::connect();
@@ -736,7 +736,7 @@ class OC_DB {
. implode('`,`', array_keys($input)) . '`) VALUES('
. str_repeat('?,', count($input)-1).'? ' . ')';
} else {
- return true;
+ return 0; //no rows updated
}
} elseif( $type == 'pgsql' || $type == 'oci' || $type == 'mysql' || $type == 'mssql') {
$query = 'INSERT INTO `' .$table . '` (`'
@@ -757,9 +757,6 @@ class OC_DB {
} catch(PDOException $e) {
OC_Template::printExceptionErrorPage( $e );
}
- if ($result === 0) {
- return true;
- }
return $result;
}