Merge lp:~aauzi/midori/fix-1197518 into lp:midori

[André Auzi]

Set FOREIGN_KEYS pragma on db initialization

[Cris Dywan (kalikiana)]

As per me understanding, without this pragma foreign keys may be skipped depending on the sqlite3 build and the pragma also enables stricter error handling.

So this seems the right thing to do.

review: Approve

=== modified file 'midori/midori-bookmarks.c'
--- midori/midori-bookmarks.c	2013-06-13 16:53:19 +0000
+++ midori/midori-bookmarks.c	2013-07-03 19:48:25 +0000
@@ -250,6 +250,16 @@
 
     if (newfile_did_exist)
     {
+        const gchar* setup_stmt = "PRAGMA foreign_keys = ON;";
+        /* initial setup */
+        if (sqlite3_exec (db, setup_stmt, NULL, NULL, &sql_errmsg) != SQLITE_OK)
+        {
+            *errmsg = g_strdup_printf (_("Couldn't setup bookmarks: %s\n"),
+                sql_errmsg ? sql_errmsg : "(err = NULL)");
+            sqlite3_free (sql_errmsg);
+            goto init_failed;
+        }
+
         /* we are done */
         goto init_success;
     }