[evolution-data-server/openismus-work] sqlitedb: Avoid warnings on upgrade from BDB format
- From: Mathias Hasselmann <hasselmm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server/openismus-work] sqlitedb: Avoid warnings on upgrade from BDB format
- Date: Thu, 13 Dec 2012 23:15:10 +0000 (UTC)
commit bd4b5646103026964b3e3195e3343e71cd7beaf1
Author: Mathias Hasselmann <mathias openismus com>
Date: Fri Dec 14 00:14:00 2012 +0100
sqlitedb: Avoid warnings on upgrade from BDB format
This is achieved by filtering out NULL vcards.
.../libedata-book/e-book-backend-sqlitedb.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/addressbook/libedata-book/e-book-backend-sqlitedb.c b/addressbook/libedata-book/e-book-backend-sqlitedb.c
index 3fddbf4..5a5fc12 100644
--- a/addressbook/libedata-book/e-book-backend-sqlitedb.c
+++ b/addressbook/libedata-book/e-book-backend-sqlitedb.c
@@ -4082,7 +4082,9 @@ validate_county_code (EBookBackendSqliteDB *ebsdb,
g_free (ebsdb->priv->country_code);
ebsdb->priv->country_code = g_strdup (country_code);
- stmt = sqlite3_mprintf ("SELECT uid, vcard, NULL FROM %Q", folderid);
+ /* Filter out NULL vcards to avoid warnings when upgrading from old Berkeley DB format */
+ stmt = sqlite3_mprintf ("SELECT uid, vcard, NULL FROM %Q "
+ "WHERE NOT vcard IS NULL", folderid);
success = book_backend_sql_exec (
ebsdb->priv->db, stmt, addto_vcard_list_cb, &vcard_data, error);
sqlite3_free (stmt);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]