Merge lp:~midori/midori/databaseAttach into lp:midori

[Cris Dywan]

Implement Midori.Database.attach method

[Paweł Forysiuk (tuxator)]

review: Approve

=== modified file 'midori/midori-bookmarksdatabase.vala'
--- midori/midori-bookmarksdatabase.vala	2013-10-11 22:36:30 +0000
+++ midori/midori-bookmarksdatabase.vala	2014-01-29 21:56:50 +0000
@@ -73,8 +73,7 @@
 
                     exec_script ("Create");
 
-                    if (db.exec ("ATTACH DATABASE '%s' AS old_db;".printf (olddbfile)) != Sqlite.OK)
-                        throw new DatabaseError.EXECUTE ("Failed to attach old database : %s (%s)".printf (olddbfile, db.errmsg ()));
+                    attach (olddbfile, "old_db");
                     
                     bool failure = false;
                     try {

=== modified file 'midori/midori-database.vala'
--- midori/midori-database.vala	2014-01-27 22:46:08 +0000
+++ midori/midori-database.vala	2014-01-29 21:56:50 +0000
@@ -147,12 +147,16 @@
             init ();
         }
 
-        public virtual bool init (GLib.Cancellable? cancellable = null) throws DatabaseError {
-            string real_path = path;
+        string resolve_path (string? path) {
             if (path == null || path.has_prefix (":memory:"))
-                real_path = ":memory:";
+                return ":memory:";
             else if (!Path.is_absolute (path))
-                real_path = Midori.Paths.get_config_filename_for_writing (path);
+                return Midori.Paths.get_config_filename_for_writing (path);
+            return path;
+        }
+
+        public virtual bool init (GLib.Cancellable? cancellable = null) throws DatabaseError {
+            string real_path = resolve_path (path);
             bool exists = Posix.access (real_path, Posix.F_OK) == 0;
 
             if (Sqlite.Database.open_v2 (real_path, out _db) != Sqlite.OK)
@@ -192,6 +196,17 @@
             return true;
         }
 
+        /*
+         * Since: 0.5.8
+         */
+        public bool attach (string path, string alias) throws DatabaseError {
+            string real_path = resolve_path (path);
+            bool exists = Posix.access (real_path, Posix.F_OK) == 0;
+            if (!exists)
+                throw new DatabaseError.OPEN ("Failed to attach database %s".printf (path));
+            return exec ("ATTACH DATABASE '%s' AS '%s';".printf (real_path, alias));
+        }
+
         public bool exec_script (string filename) throws DatabaseError {
             string basename = Path.get_basename (path);
             string[] parts = basename.split (".");

=== modified file 'midori/midori-historydatabase.vala'
--- midori/midori-historydatabase.vala	2013-12-16 22:38:24 +0000
+++ midori/midori-historydatabase.vala	2014-01-29 21:56:50 +0000
@@ -40,7 +40,7 @@
             Object (path: "history.db");
             init ();
             Midori.BookmarksDatabase bookmarks_database = new Midori.BookmarksDatabase ();
-            exec ("ATTACH DATABASE '%s' AS bookmarks".printf (bookmarks_database.path));
+            attach (bookmarks_database.path, "bookmarks");
 
             try {
                 exec ("SELECT day FROM history LIMIT 1");