Hello community,
here is the log from the commit of package akonadi-runtime for openSUSE:Factory
checked in at 2012-03-13 09:31:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/akonadi-runtime (Old)
and /work/SRC/openSUSE:Factory/.akonadi-runtime.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "akonadi-runtime", Maintainer is "kde-maintain...@suse.de"
Changes:
--------
--- /work/SRC/openSUSE:Factory/akonadi-runtime/akonadi-runtime.changes
2012-01-27 15:16:05.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.akonadi-runtime.new/akonadi-runtime.changes
2012-03-13 09:31:59.000000000 +0100
@@ -1,0 +2,8 @@
+Wed Mar 7 11:51:03 UTC 2012 - idon...@suse.com
+
+- Update to 1.7.1
+ * Don't truncate SPARQL queries in virtual collections.
+ * Optimize change notifications for deleted collection attributes.
+ * Fix possible data loss during item copy/move operations.
+
+-------------------------------------------------------------------
Old:
----
akonadi-1.7.0.tar.bz2
New:
----
akonadi-1.7.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ akonadi-runtime.spec ++++++
--- /var/tmp/diff_new_pack.1z5a7y/_old 2012-03-13 09:32:01.000000000 +0100
+++ /var/tmp/diff_new_pack.1z5a7y/_new 2012-03-13 09:32:01.000000000 +0100
@@ -16,9 +16,8 @@
#
-
Name: akonadi-runtime
-Version: 1.7.0
+Version: 1.7.1
Release: 0
%define rversion %{version}
Summary: PIM Storage Service
@@ -45,9 +44,9 @@
Requires(postun): shared-mime-info
Requires: libakonadiprotocolinternals1 = %{version}
-Requires: libqt4 >= %(rpm -q --queryformat '%{VERSION}' libqt4)
Requires: libqt4-sql-mysql
Requires: mysql
+Requires: libqt4 >= %(rpm -q --queryformat '%{VERSION}' libqt4)
Suggests: mysql-community-server
%description
@@ -58,8 +57,8 @@
Summary: PIM Storage Service: Build Environment
Group: Development/Libraries/X11
Requires: libakonadiprotocolinternals1 = %{version}
-Requires: libqt4-devel >= %( echo `rpm -q --queryformat '%{VERSION}'
libqt4-devel`)
Requires: libsoprano-devel
+Requires: libqt4-devel >= %( echo `rpm -q --queryformat '%{VERSION}'
libqt4-devel`)
# rename from 10.3, which had 4.x version
Provides: akonadi-devel = %{version}
Obsoletes: akonadi-devel < 4.1
++++++ akonadi-1.7.0.tar.bz2 -> akonadi-1.7.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/akonadi-1.7.0/CMakeLists.txt
new/akonadi-1.7.1/CMakeLists.txt
--- old/akonadi-1.7.0/CMakeLists.txt 2012-01-23 18:11:04.000000000 +0100
+++ new/akonadi-1.7.1/CMakeLists.txt 2012-03-03 16:48:19.000000000 +0100
@@ -56,7 +56,7 @@
set(AKONADI_VERSION_MAJOR "1")
set(AKONADI_VERSION_MINOR "7")
-set(AKONADI_VERSION_PATCH "0")
+set(AKONADI_VERSION_PATCH "1")
set(AKONADI_VERSION
"${AKONADI_VERSION_MAJOR}.${AKONADI_VERSION_MINOR}.${AKONADI_VERSION_PATCH}")
set(AKONADI_VERSION_STRING "${AKONADI_VERSION}")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/akonadi-1.7.0/Mainpage.dox
new/akonadi-1.7.1/Mainpage.dox
--- old/akonadi-1.7.0/Mainpage.dox 2012-01-23 18:11:04.000000000 +0100
+++ new/akonadi-1.7.1/Mainpage.dox 2012-03-03 16:48:19.000000000 +0100
@@ -315,6 +315,6 @@
// DOXYGEN_EXCLUDE = sqlplugin server/control server/akonadictl server/tests
// DOXYGEN_PROJECTNAME=Akonadi
-// DOXYGEN_PROJECTVERSION=1.7.0
+// DOXYGEN_PROJECTVERSION=1.7.1
// vim:ts=4:sw=4:expandtab:filetype=doxygen
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/akonadi-1.7.0/NEWS new/akonadi-1.7.1/NEWS
--- old/akonadi-1.7.0/NEWS 2012-01-23 18:11:04.000000000 +0100
+++ new/akonadi-1.7.1/NEWS 2012-03-03 16:48:19.000000000 +0100
@@ -1,3 +1,9 @@
+1.7.1 03-March-2012
+---------------------------------------------
+- Don't truncate SPARQL queries in virtual collections.
+- Optimize change notifications for deleted collection attributes.
+- Fix possible data loss during item copy/move operations.
+
1.7.0 23-January-2012
---------------------------------------------
- Fix search result retrieval from Nepomuk.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/akonadi-1.7.0/server/src/handler/modify.cpp
new/akonadi-1.7.1/server/src/handler/modify.cpp
--- old/akonadi-1.7.0/server/src/handler/modify.cpp 2012-01-23
18:11:04.000000000 +0100
+++ new/akonadi-1.7.1/server/src/handler/modify.cpp 2012-03-03
16:48:19.000000000 +0100
@@ -172,9 +172,8 @@
// custom attribute
if ( type.startsWith( '-' ) ) {
type = type.mid( 1 );
- if ( !db->removeCollectionAttribute( collection, type ) )
- return failureResponse( "Unable to remove custom collection
attribute" );
- changes.append( type );
+ if ( db->removeCollectionAttribute( collection, type ) )
+ changes.append( type );
} else {
QByteArray value;
pos = ImapParser::parseString( line, value, pos );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/akonadi-1.7.0/server/src/storage/akonadidb.xml
new/akonadi-1.7.1/server/src/storage/akonadidb.xml
--- old/akonadi-1.7.0/server/src/storage/akonadidb.xml 2012-01-23
18:11:04.000000000 +0100
+++ new/akonadi-1.7.1/server/src/storage/akonadidb.xml 2012-03-03
16:48:19.000000000 +0100
@@ -35,7 +35,7 @@
Column attributes:
- name: The column name, will be also used as accessor name in the entity
class.
- type: The C++ type of this column, the SQL type will be derived from that.
- - sqltype: The SQL type (optional), overwrites types derived from the C++
type.
+ - size: The size of the SQL column (optional, semantic depends on "type")
- default: Default value for entity class constructor.
- refTable, refColumn: foreign key, also used to generate accessor methods
for 1:n relations
- methodName: method name to access referred records, the table name is used
if not given
@@ -65,7 +65,7 @@
<table name="SchemaVersion">
<comment>Contains the schema version of the database.</comment>
<column name="version" type="int" default="0" allowNull="false"/>
- <data columns="version" values="19"/>
+ <data columns="version" values="20"/>
</table>
<table name="Resource">
@@ -89,7 +89,7 @@
<column name="cachePolicyCacheTimeout" type="int" default="-1"
allowNull="false"/>
<column name="cachePolicySyncOnDemand" type="bool" default="false"
allowNull="false"/>
<column name="cachePolicyLocalParts" type="QString"/>
- <column name="queryString" type="QString"/>
+ <column name="queryString" type="QString" size="1024"/>
<column name="queryLanguage" type="QString"/>
<index name="parentAndNameIndex" columns="parentId,name" unique="true"/>
<reference name="children" table="Collection" key="parentId"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/akonadi-1.7.0/server/src/storage/akonadidb.xsd
new/akonadi-1.7.1/server/src/storage/akonadidb.xsd
--- old/akonadi-1.7.0/server/src/storage/akonadidb.xsd 2012-01-23
18:11:04.000000000 +0100
+++ new/akonadi-1.7.1/server/src/storage/akonadidb.xsd 2012-03-03
16:48:19.000000000 +0100
@@ -61,7 +61,7 @@
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required"/>
<xsd:attribute name="type" type="xsd:string" use="required"/>
- <xsd:attribute name="sqltype" type="xsd:string"/>
+ <xsd:attribute name="size" type="xsd:integer"/>
<xsd:attribute name="default" type="xsd:string"/>
<xsd:attribute name="allowNull" type="xsd:boolean" default="true"/>
<xsd:attribute name="isUnique" type="xsd:boolean" default="false"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/akonadi-1.7.0/server/src/storage/datastore.cpp
new/akonadi-1.7.1/server/src/storage/datastore.cpp
--- old/akonadi-1.7.0/server/src/storage/datastore.cpp 2012-01-23
18:11:04.000000000 +0100
+++ new/akonadi-1.7.1/server/src/storage/datastore.cpp 2012-03-03
16:48:19.000000000 +0100
@@ -33,6 +33,7 @@
#include "akdebug.h"
#include "parthelper.h"
#include "libs/protocol_p.h"
+#include "handler.h"
#include <QtCore/QCoreApplication>
#include <QtCore/QDir>
@@ -95,6 +96,8 @@
debugLastDbError( "Cannot open database." );
else
qDebug() << "Database" << m_database.databaseName() << "opened using
driver" << m_database.driverName();
+
+ DbConfig::configuredDatabase()->initSession( m_database );
}
void Akonadi::DataStore::close()
@@ -534,15 +537,19 @@
qb.addValueCondition( CollectionAttribute::collectionIdColumn(),
Query::Equals, col.id() );
qb.addValueCondition( CollectionAttribute::typeColumn(), Query::Equals, key
);
if ( !qb.exec() )
- return false;
+ throw HandlerException( "Unable to query for collection attribute" );
- foreach ( CollectionAttribute attr, qb.result() ) {
+ const QVector<CollectionAttribute> result = qb.result();
+ foreach ( CollectionAttribute attr, result ) {
if ( !attr.remove() )
- return false;
+ throw HandlerException( "Unable to remove collection attribute" );
}
- mNotificationCollector->collectionChanged( col, QList<QByteArray>() << key );
- return true;
+ if (!result.isEmpty()) {
+ mNotificationCollector->collectionChanged( col, QList<QByteArray>() << key
);
+ return true;
+ }
+ return false;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/akonadi-1.7.0/server/src/storage/datastore.h
new/akonadi-1.7.1/server/src/storage/datastore.h
--- old/akonadi-1.7.0/server/src/storage/datastore.h 2012-01-23
18:11:04.000000000 +0100
+++ new/akonadi-1.7.1/server/src/storage/datastore.h 2012-03-03
16:48:19.000000000 +0100
@@ -183,6 +183,11 @@
/* --- Collection attributes ------------------------------------------ */
bool addCollectionAttribute( const Collection &col, const QByteArray &key,
const QByteArray &value );
+ /**
+ * Removes the given collection attribute for @p col.
+ * @throws HandlerException on database errors
+ * @returns @c true if the attribute existed, @c false otherwise
+ */
bool removeCollectionAttribute( const Collection &col, const QByteArray
&key );
/* --- Helper functions ---------------------------------------------- */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/akonadi-1.7.0/server/src/storage/dbconfig.cpp
new/akonadi-1.7.1/server/src/storage/dbconfig.cpp
--- old/akonadi-1.7.0/server/src/storage/dbconfig.cpp 2012-01-23
18:11:04.000000000 +0100
+++ new/akonadi-1.7.1/server/src/storage/dbconfig.cpp 2012-03-03
16:48:19.000000000 +0100
@@ -125,3 +125,7 @@
return QLatin1Literal("akonadi_") % AkApplication::instanceIdentifier();
}
+void DbConfig::initSession(const QSqlDatabase& database)
+{
+ Q_UNUSED(database);
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/akonadi-1.7.0/server/src/storage/dbconfig.h
new/akonadi-1.7.1/server/src/storage/dbconfig.h
--- old/akonadi-1.7.0/server/src/storage/dbconfig.h 2012-01-23
18:11:04.000000000 +0100
+++ new/akonadi-1.7.1/server/src/storage/dbconfig.h 2012-03-03
16:48:19.000000000 +0100
@@ -65,6 +65,13 @@
virtual void apply( QSqlDatabase &database ) = 0;
/**
+ * Do session setup/initialization work on @p database.
+ * An example would be to run some SQL commands on every new session,
+ * typically stuff like setting encodings, transaction isolation levels,
etc.
+ */
+ virtual void initSession( const QSqlDatabase& database );
+
+ /**
* Returns whether an internal server needs to be used.
*/
virtual bool useInternalServer() const = 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/akonadi-1.7.0/server/src/storage/dbconfigmysql.cpp
new/akonadi-1.7.1/server/src/storage/dbconfigmysql.cpp
--- old/akonadi-1.7.0/server/src/storage/dbconfigmysql.cpp 2012-01-23
18:11:04.000000000 +0100
+++ new/akonadi-1.7.1/server/src/storage/dbconfigmysql.cpp 2012-03-03
16:48:19.000000000 +0100
@@ -345,3 +345,9 @@
if ( !result )
mDatabaseProcess->kill();
}
+
+void DbConfigMysql::initSession(const QSqlDatabase& database)
+{
+ QSqlQuery query( database );
+ query.exec( QLatin1String("SET SESSION TRANSACTION ISOLATION LEVEL READ
COMMITTED") );
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/akonadi-1.7.0/server/src/storage/dbconfigmysql.h
new/akonadi-1.7.1/server/src/storage/dbconfigmysql.h
--- old/akonadi-1.7.0/server/src/storage/dbconfigmysql.h 2012-01-23
18:11:04.000000000 +0100
+++ new/akonadi-1.7.1/server/src/storage/dbconfigmysql.h 2012-03-03
16:48:19.000000000 +0100
@@ -69,6 +69,9 @@
*/
virtual void stopInternalServer();
+ /// reimpl
+ virtual void initSession(const QSqlDatabase& database);
+
private:
QString mDatabaseName;
QString mHostName;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/akonadi-1.7.0/server/src/storage/dbinitializer.cpp
new/akonadi-1.7.1/server/src/storage/dbinitializer.cpp
--- old/akonadi-1.7.0/server/src/storage/dbinitializer.cpp 2012-01-23
18:11:04.000000000 +0100
+++ new/akonadi-1.7.1/server/src/storage/dbinitializer.cpp 2012-03-03
16:48:19.000000000 +0100
@@ -37,7 +37,7 @@
using namespace Akonadi;
DbInitializer::ColumnDescription::ColumnDescription()
- : allowNull( true ), isAutoIncrement( false ), isPrimaryKey( false ),
isUnique( false )
+ : size( -1 ), allowNull( true ), isAutoIncrement( false ), isPrimaryKey(
false ), isUnique( false )
{
}
@@ -141,6 +141,9 @@
columnDescription.name = childElement.attribute( QLatin1String( "name" )
);
columnDescription.type = childElement.attribute( QLatin1String( "type" )
);
+ if ( childElement.hasAttribute( QLatin1String("size") ) )
+ columnDescription.size = childElement.attribute( QLatin1String("size")
).toInt();
+
if ( childElement.hasAttribute( QLatin1String( "allowNull" ) ) )
columnDescription.allowNull = (childElement.attribute( QLatin1String(
"allowNull" ) ) == QLatin1String( "true" ));
@@ -333,8 +336,9 @@
return mErrorMsg;
}
-QString DbInitializer::sqlType(const QString & type) const
+QString DbInitializer::sqlType(const QString & type, int size) const
{
+ Q_UNUSED(size);
if ( type == QLatin1String("int") )
return QLatin1String("INTEGER");
if ( type == QLatin1String("qint64") )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/akonadi-1.7.0/server/src/storage/dbinitializer.h
new/akonadi-1.7.1/server/src/storage/dbinitializer.h
--- old/akonadi-1.7.0/server/src/storage/dbinitializer.h 2012-01-23
18:11:04.000000000 +0100
+++ new/akonadi-1.7.1/server/src/storage/dbinitializer.h 2012-03-03
16:48:19.000000000 +0100
@@ -82,6 +82,7 @@
QString name;
QString type;
+ int size;
bool allowNull;
bool isAutoIncrement;
bool isPrimaryKey;
@@ -156,8 +157,12 @@
*/
DbInitializer( const QSqlDatabase &database, const QString &templateFile );
- /** Overwrite in backend-specific sub-classes to return the SQL type for a
given C++ type. */
- virtual QString sqlType( const QString &type ) const;
+ /**
+ * Overwrite in backend-specific sub-classes to return the SQL type for a
given C++ type.
+ * @param type Name of the C++ type.
+ * @param size Optional size hint for the column, if -1 use the default
SQL type for @p type.
+ */
+ virtual QString sqlType( const QString &type, int size ) const;
/** Overwrite in backend-specific sub-classes to return the SQL value for
a given C++ value. */
virtual QString sqlValue( const QString &type, const QString &value )
const;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/akonadi-1.7.0/server/src/storage/dbinitializer_p.cpp
new/akonadi-1.7.1/server/src/storage/dbinitializer_p.cpp
--- old/akonadi-1.7.0/server/src/storage/dbinitializer_p.cpp 2012-01-23
18:11:04.000000000 +0100
+++ new/akonadi-1.7.1/server/src/storage/dbinitializer_p.cpp 2012-03-03
16:48:19.000000000 +0100
@@ -27,12 +27,12 @@
{
}
-QString DbInitializerMySql::sqlType(const QString & type) const
+QString DbInitializerMySql::sqlType(const QString & type, int size) const
{
if ( type == QLatin1String( "QString" ) )
- return QLatin1String( "VARBINARY(255)" );
+ return QLatin1Literal("VARBINARY(") + QString::number(size <= 0 ? 255 :
size) + QLatin1Literal(")");
else
- return DbInitializer::sqlType( type );
+ return DbInitializer::sqlType( type, size );
}
QString DbInitializerMySql::hasIndexQuery(const QString& tableName, const
QString& indexName)
@@ -68,7 +68,7 @@
{
QString column = columnDescription.name;
- column += QLatin1Char( ' ' ) + sqlType( columnDescription.type );
+ column += QLatin1Char( ' ' ) + sqlType( columnDescription.type,
columnDescription.size );
if ( !columnDescription.allowNull )
column += QLatin1String( " NOT NULL" );
@@ -140,7 +140,7 @@
if ( columnDescription.isAutoIncrement )
column += QLatin1String( "INTEGER" );
else
- column += sqlType( columnDescription.type );
+ column += sqlType( columnDescription.type, columnDescription.size );
if ( columnDescription.isPrimaryKey )
column += QLatin1String( " PRIMARY KEY" );
@@ -190,7 +190,7 @@
{
}
-QString DbInitializerPostgreSql::sqlType(const QString& type) const
+QString DbInitializerPostgreSql::sqlType(const QString& type, int size) const
{
if ( type == QLatin1String("qint64") )
return QLatin1String( "int8" );
@@ -198,7 +198,7 @@
return QLatin1String("BYTEA");
if ( type == QLatin1String("QString") )
return QLatin1String("BYTEA");
- return DbInitializer::sqlType( type );
+ return DbInitializer::sqlType( type, size );
}
QString DbInitializerPostgreSql::hasIndexQuery(const QString& tableName, const
QString& indexName)
@@ -226,7 +226,7 @@
if ( columnDescription.isAutoIncrement )
column += QLatin1String( "SERIAL" );
else
- column += sqlType( columnDescription.type );
+ column += sqlType( columnDescription.type, columnDescription.size );
if ( columnDescription.isPrimaryKey )
column += QLatin1String( " PRIMARY KEY" );
@@ -307,15 +307,15 @@
{
}
-QString DbInitializerVirtuoso::sqlType(const QString& type) const
+QString DbInitializerVirtuoso::sqlType(const QString& type, int size) const
{
if ( type == QLatin1String("QString") )
- return QLatin1String( "VARCHAR(255)" );
+ return QLatin1Literal("VARCHAR(") + QString::number(size <= 0 ? 255 :
size) + QLatin1Literal(")");
if (type == QLatin1String("QByteArray") )
return QLatin1String("LONG VARCHAR");
if ( type == QLatin1String( "bool" ) )
return QLatin1String("CHAR");
- return DbInitializer::sqlType( type );
+ return DbInitializer::sqlType( type, size );
}
QString DbInitializerVirtuoso::sqlValue(const QString& type, const QString&
value) const
@@ -347,7 +347,7 @@
{
QString column = columnDescription.name;
- column += QLatin1Char( ' ' ) + sqlType( columnDescription.type );
+ column += QLatin1Char( ' ' ) + sqlType( columnDescription.type,
columnDescription.size );
if ( !columnDescription.allowNull )
column += QLatin1String( " NOT NULL" );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/akonadi-1.7.0/server/src/storage/dbinitializer_p.h
new/akonadi-1.7.1/server/src/storage/dbinitializer_p.h
--- old/akonadi-1.7.0/server/src/storage/dbinitializer_p.h 2012-01-23
18:11:04.000000000 +0100
+++ new/akonadi-1.7.1/server/src/storage/dbinitializer_p.h 2012-03-03
16:48:19.000000000 +0100
@@ -28,7 +28,7 @@
public:
DbInitializerMySql(const QSqlDatabase& database, const QString&
templateFile);
protected:
- QString sqlType(const QString& type) const;
+ QString sqlType(const QString& type, int size) const;
QString hasIndexQuery(const QString& tableName, const QString& indexName);
virtual QString buildCreateTableStatement( const TableDescription
&tableDescription ) const;
@@ -53,7 +53,7 @@
public:
DbInitializerPostgreSql(const QSqlDatabase& database, const QString&
templateFile);
protected:
- QString sqlType(const QString& type) const;
+ QString sqlType(const QString& type, int size) const;
QString hasIndexQuery(const QString& tableName, const QString& indexName);
virtual QString buildCreateTableStatement( const TableDescription
&tableDescription ) const;
@@ -67,7 +67,7 @@
public:
DbInitializerVirtuoso(const QSqlDatabase& database, const QString&
templateFile);
protected:
- QString sqlType(const QString& type) const;
+ QString sqlType(const QString& type, int size) const;
QString sqlValue(const QString& type, const QString& value) const;
bool hasIndex(const QString& tableName, const QString& indexName);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/akonadi-1.7.0/server/src/storage/dbupdate.xml
new/akonadi-1.7.1/server/src/storage/dbupdate.xml
--- old/akonadi-1.7.0/server/src/storage/dbupdate.xml 2012-01-23
18:11:04.000000000 +0100
+++ new/akonadi-1.7.1/server/src/storage/dbupdate.xml 2012-03-03
16:48:19.000000000 +0100
@@ -145,4 +145,9 @@
<raw-sql backends="mysql,psql,sqlite,odbc">UPDATE PimItemFlagRelation SET
Flag_id=(SELECT id FROM FlagTable WHERE name='\\SEEN') WHERE Flag_id=(SELECT id
FROM FlagTable WHERE name='\\Seen');</raw-sql>
<raw-sql backends="mysql,psql,sqlite,odbc">DELETE FROM FlagTable WHERE
name='\\Seen';</raw-sql>
</update>
+
+ <!-- wider query column (only affects MySQL) -->
+ <update version="20" abortOnFailure="false">
+ <raw-sql backends="mysql">ALTER TABLE CollectionTable CHANGE queryString
queryString VARBINARY(1024);</raw-sql>
+ </update>
</updates>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-1.7.0/server/tests/unittest/dbinitializertest_data/mysql_ct_collection
new/akonadi-1.7.1/server/tests/unittest/dbinitializertest_data/mysql_ct_collection
---
old/akonadi-1.7.0/server/tests/unittest/dbinitializertest_data/mysql_ct_collection
2012-01-23 18:11:04.000000000 +0100
+++
new/akonadi-1.7.1/server/tests/unittest/dbinitializertest_data/mysql_ct_collection
2012-03-03 16:48:19.000000000 +0100
@@ -10,7 +10,7 @@
cachePolicyCacheTimeout INTEGER NOT NULL DEFAULT
-1,
cachePolicySyncOnDemand BOOL NOT NULL DEFAULT
false,
cachePolicyLocalParts VARBINARY(255),
- queryString VARBINARY(255),
+ queryString VARBINARY(1024),
queryLanguage VARBINARY(255),
FOREIGN KEY (parentId) REFERENCES
CollectionTable(id) ON DELETE CASCADE ON UPDATE CASCADE,
FOREIGN KEY (resourceId) REFERENCES
ResourceTable(id) ON DELETE CASCADE ON UPDATE CASCADE)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-1.7.0/server/tests/unittest/dbinitializertest_data/odbc_ct_collection
new/akonadi-1.7.1/server/tests/unittest/dbinitializertest_data/odbc_ct_collection
---
old/akonadi-1.7.0/server/tests/unittest/dbinitializertest_data/odbc_ct_collection
2012-01-23 18:11:04.000000000 +0100
+++
new/akonadi-1.7.1/server/tests/unittest/dbinitializertest_data/odbc_ct_collection
2012-03-03 16:48:19.000000000 +0100
@@ -10,5 +10,5 @@
cachePolicyCacheTimeout INTEGER NOT NULL DEFAULT
-1,
cachePolicySyncOnDemand CHAR NOT NULL DEFAULT 0,
cachePolicyLocalParts VARCHAR(255),
- queryString VARCHAR(255),
+ queryString VARCHAR(1024),
queryLanguage VARCHAR(255))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-1.7.0/server/tests/unittest/dbupdatertest.cpp
new/akonadi-1.7.1/server/tests/unittest/dbupdatertest.cpp
--- old/akonadi-1.7.0/server/tests/unittest/dbupdatertest.cpp 2012-01-23
18:11:04.000000000 +0100
+++ new/akonadi-1.7.1/server/tests/unittest/dbupdatertest.cpp 2012-03-03
16:48:19.000000000 +0100
@@ -57,7 +57,7 @@
QVERIFY( updateSets.contains( 17 ) );
QVERIFY( updateSets.contains( 18 ) );
QVERIFY( updateSets.contains( 19 ) );
- QCOMPARE( updateSets.count(), 13 );
+ QCOMPARE( updateSets.count(), 14 );
updateSets.clear();
QVERIFY( updater.parseUpdateSets( 13, updateSets ) );
@@ -74,7 +74,7 @@
QVERIFY( updateSets.contains( 17 ) );
QVERIFY( updateSets.contains( 18 ) );
QVERIFY( updateSets.contains( 19 ) );
- QCOMPARE( updateSets.count(), 6 );
+ QCOMPARE( updateSets.count(), 7 );
QCOMPARE( updateSets.value( 14 ).statements.count(), 2 );
QCOMPARE( updateSets.value( 16 ).statements.count(), 11 );
@@ -100,7 +100,7 @@
QVERIFY( updateSets.contains( 17 ) );
QVERIFY( updateSets.contains( 18 ) );
QVERIFY( updateSets.contains( 19 ) );
- QCOMPARE( updateSets.count(), 13 );
+ QCOMPARE( updateSets.count(), 14 );
updateSets.clear();
QVERIFY( updater.parseUpdateSets( 13, updateSets ) );
@@ -117,7 +117,7 @@
QVERIFY( updateSets.contains( 17 ) );
QVERIFY( updateSets.contains( 18 ) );
QVERIFY( updateSets.contains( 19 ) );
- QCOMPARE( updateSets.count(), 6 );
+ QCOMPARE( updateSets.count(), 7 );
QCOMPARE( updateSets.value( 14 ).statements.count(), 2 );
QCOMPARE( updateSets.value( 16 ).statements.count(), 11 );
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
