[Pkg-owncloud-commits] [owncloud] 63/118: Also add a note that clob does not work in the compare array

David Prévot taffit at moszumanska.debian.org
Fri Mar 27 22:13:13 UTC 2015


This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit 9ad48e0fe9377189dc3ff09a820b7dc61d31ef9f
Author: Joas Schilling <nickvergessen at owncloud.com>
Date:   Mon Mar 16 15:41:00 2015 +0100

    Also add a note that clob does not work in the compare array
    
    Conflicts:
    	lib/private/appframework/db/db.php
---
 lib/private/db/adapter.php       | 1 +
 lib/private/db/adaptersqlite.php | 1 +
 lib/private/db/connection.php    | 1 +
 lib/public/idbconnection.php     | 1 +
 4 files changed, 4 insertions(+)

diff --git a/lib/private/db/adapter.php b/lib/private/db/adapter.php
index de7b04c..8c251c8 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 31f8894..a910696 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 ed71738..0da3c84 100644
--- a/lib/private/db/connection.php
+++ b/lib/private/db/connection.php
@@ -161,6 +161,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 0671cb4..7027f52 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
 	 */

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git



More information about the Pkg-owncloud-commits mailing list