[evolution-data-server/openismus-work-3-8] EBookBackendSqliteDB: Fixed data migration routine

[Tristan Van Berkom <tvb src gnome org>]

commit c0a26801f129786461ccf82e3224fcd1ebf4d3c5
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Thu Aug 29 13:46:54 2013 +0200

    EBookBackendSqliteDB: Fixed data migration routine
    
    There remained some problems in the migration, malformed SQL statements
    (plus the migration to version 7 was failing when upgrading from version
    7 to 8, now we dont try to upgrade to version 7 if we are already
    at version 7).

 .../libedata-book/e-book-backend-sqlitedb.c        |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/addressbook/libedata-book/e-book-backend-sqlitedb.c 
b/addressbook/libedata-book/e-book-backend-sqlitedb.c
index 71c395d..33f58ea 100644
--- a/addressbook/libedata-book/e-book-backend-sqlitedb.c
+++ b/addressbook/libedata-book/e-book-backend-sqlitedb.c
@@ -614,7 +614,7 @@ create_folders_table (EBookBackendSqliteDB *ebsdb,
         * create_contacts_table() as we need introspection details for doing
         * that.
         */
-       if (version >= 3 && version < FOLDER_VERSION) {
+       if (version >= 3 && version < 7) {
                stmt = "UPDATE folders SET "
                                "multivalues = REPLACE(RTRIM(REPLACE("
                                        "multivalues || ':', ':', "
@@ -1069,7 +1069,7 @@ create_contacts_table (EBookBackendSqliteDB *ebsdb,
                                string = g_string_new (tmp);
 
                                g_string_append (string, ebsdb->priv->summary_fields[i].dbname);
-                               g_string_append (string, "_localized TEXT, ");
+                               g_string_append (string, "_localized TEXT");
 
                                success = book_backend_sql_exec (
                                        ebsdb->priv->db, string->str, NULL, NULL , error);
@@ -1092,7 +1092,7 @@ create_contacts_table (EBookBackendSqliteDB *ebsdb,
                                string = g_string_new (tmp);
 
                                g_string_append (string, ebsdb->priv->summary_fields[i].dbname);
-                               g_string_append (string, "_translit TEXT, ");
+                               g_string_append (string, "_translit TEXT");
 
                                success = book_backend_sql_exec (
                                        ebsdb->priv->db, string->str, NULL, NULL , error);