[Midnightbsd-cvs] src [6792] trunk/lib/libmport/db.c: update database version when upgrading the schema

[laffer1 at midnightbsd.org]

Revision: 6792
          http://svnweb.midnightbsd.org/src/?rev=6792
Author:   laffer1
Date:     2014-10-01 21:09:47 -0400 (Wed, 01 Oct 2014)
Log Message:
-----------
update database version when upgrading the schema

Modified Paths:
--------------
    trunk/lib/libmport/db.c

Modified: trunk/lib/libmport/db.c
===================================================================
--- trunk/lib/libmport/db.c	2014-10-01 01:14:22 UTC (rev 6791)
+++ trunk/lib/libmport/db.c	2014-10-02 01:09:47 UTC (rev 6792)
@@ -62,6 +62,7 @@
   sqlcode = sqlite3_exec(db, sql, 0, 0, 0);
   /* if we get an error code, we want to run it again in some cases */
   if (sqlcode == SQLITE_BUSY || sqlcode == SQLITE_LOCKED) {
+    sleep(1);
     if (sqlite3_exec(db, sql, 0, 0, 0) != SQLITE_OK) {
       sqlite3_free(sql);
       RETURN_ERROR(MPORT_ERR_FATAL, sqlite3_errmsg(db));
@@ -189,9 +190,9 @@
 		case 1:
 			mport_upgrade_master_schema_0to2(db);
 			mport_upgrade_master_schema_2to3(db);
-			mport_set_database_version(db);
 		case 2:
 			mport_upgrade_master_schema_2to3(db);
+			mport_set_database_version(db);
 			break;
 		case 3:
 			break;