Merge pull request #14923 from owncloud/fix-preference-key-definition

Fix user preference key definition for insertIfNotExists()

6 files changed, 6 insertions, 1 deletions

diff --git a/lib/private/allconfig.php b/lib/private/allconfig.php
index b8bba7986e6..8d4f13e5b9c 100644
--- a/lib/private/allconfig.php
+++ b/lib/private/allconfig.php
@@ -196,7 +196,7 @@ class AllConfig implements \OCP\IConfig {
 				'userid'		=> $userId,
 				'appid'			=> $appName,
 				'configkey'		=> $key,
-			], ['configvalue', 'userid', 'appid']);
+			], ['configkey', 'userid', 'appid']);
 			$affectedRows = 1;
 		} elseif ($exists) {
 			$data = array($value, $userId, $appName, $key);
diff --git a/lib/private/appframework/db/db.php b/lib/private/appframework/db/db.php
index 0824e108f49..a9c6fc1e9c7 100644
--- a/lib/private/appframework/db/db.php
+++ b/lib/private/appframework/db/db.php
@@ -127,6 +127,7 @@ class Db implements IDb {
 	 * @param array $input data that should be inserted into the table  (column name => value)
 	 * @param array|null $compare List of values that should be checked for "if not exists"
 	 *				If this is null or an empty array, all keys of $input will be compared
+	 *				Please note: text fields (clob) must not be used in the compare array
 	 * @return int number of inserted rows
 	 * @throws \Doctrine\DBAL\DBALException
 	 */
diff --git a/lib/private/db/adapter.php b/lib/private/db/adapter.php
index de7b04c74db..8c251c82075 100644
--- a/lib/private/db/adapter.php
+++ b/lib/private/db/adapter.php
@@ -46,6 +46,7 @@ class Adapter {
 	 * @param array $input data that should be inserted into the table  (column name => value)
 	 * @param array|null $compare List of values that should be checked for "if not exists"
 	 *				If this is null or an empty array, all keys of $input will be compared
+	 *				Please note: text fields (clob) must not be used in the compare array
 	 * @return int number of inserted rows
 	 * @throws \Doctrine\DBAL\DBALException
 	 */
diff --git a/lib/private/db/adaptersqlite.php b/lib/private/db/adaptersqlite.php
index 31f88940f0b..a9106967333 100644
--- a/lib/private/db/adaptersqlite.php
+++ b/lib/private/db/adaptersqlite.php
@@ -25,6 +25,7 @@ class AdapterSqlite extends Adapter {
 	 * @param array $input data that should be inserted into the table  (column name => value)
 	 * @param array|null $compare List of values that should be checked for "if not exists"
 	 *				If this is null or an empty array, all keys of $input will be compared
+	 *				Please note: text fields (clob) must not be used in the compare array
 	 * @return int number of inserted rows
 	 * @throws \Doctrine\DBAL\DBALException
 	 */
diff --git a/lib/private/db/connection.php b/lib/private/db/connection.php
index 023e265f242..8748f66b369 100644
--- a/lib/private/db/connection.php
+++ b/lib/private/db/connection.php
@@ -163,6 +163,7 @@ class Connection extends \Doctrine\DBAL\Connection implements IDBConnection {
 	 * @param array $input data that should be inserted into the table  (column name => value)
 	 * @param array|null $compare List of values that should be checked for "if not exists"
 	 *				If this is null or an empty array, all keys of $input will be compared
+	 *				Please note: text fields (clob) must not be used in the compare array
 	 * @return int number of inserted rows
 	 * @throws \Doctrine\DBAL\DBALException
 	 */
diff --git a/lib/public/idbconnection.php b/lib/public/idbconnection.php
index 1117c2da9b2..38f5c7e2e59 100644
--- a/lib/public/idbconnection.php
+++ b/lib/public/idbconnection.php
@@ -83,6 +83,7 @@ interface IDBConnection {
 	 * @param array $input data that should be inserted into the table  (column name => value)
 	 * @param array|null $compare List of values that should be checked for "if not exists"
 	 *				If this is null or an empty array, all keys of $input will be compared
+	 *				Please note: text fields (clob) must not be used in the compare array
 	 * @return int number of inserted rows
 	 * @throws \Doctrine\DBAL\DBALException
 	 */