X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=lib%2Fdatabase.cc;h=3b342f136a5397b32096987d0ad3592c43e4fc63;hb=07b6220a5595bf4556e636709220121d6405e9e9;hp=f39d4485076cf9e855f6d7fe2401d4b1cf1894b4;hpb=87ee9a53e36f395e73e16da12cb268a708147259;p=notmuch

diff --git a/lib/database.cc b/lib/database.cc
index f39d4485..3b342f13 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -1450,9 +1450,10 @@ notmuch_database_upgrade (notmuch_database_t *notmuch,
 
 	query = notmuch_query_create (notmuch, "");
 
-	/* XXX: this should use the _st version, but needs an error
-	   path */
-	for (messages = notmuch_query_search_messages (query);
+	status = notmuch_query_search_messages_st (query, &messages);
+	if (status)
+	    goto DONE;
+	for (;
 	     notmuch_messages_valid (messages);
 	     notmuch_messages_move_to_next (messages))
 	{
@@ -1634,6 +1635,9 @@ notmuch_database_begin_atomic (notmuch_database_t *notmuch)
 	notmuch->atomic_nesting > 0)
 	goto DONE;
 
+	if (notmuch_database_needs_upgrade(notmuch))
+		return NOTMUCH_STATUS_UPGRADE_REQUIRED;
+
     try {
 	(static_cast <Xapian::WritableDatabase *> (notmuch->xapian_db))->begin_transaction (false);
     } catch (const Xapian::Error &error) {