[Midnightbsd-cvs] src [7612] stable/0.8/lib/libmport/db.c: tweak upgrades

[laffer1 at midnightbsd.org]

Revision: 7612
          http://svnweb.midnightbsd.org/src/?rev=7612
Author:   laffer1
Date:     2016-05-30 16:40:17 -0400 (Mon, 30 May 2016)
Log Message:
-----------
tweak upgrades

Modified Paths:
--------------
    stable/0.8/lib/libmport/db.c

Modified: stable/0.8/lib/libmport/db.c
===================================================================
--- stable/0.8/lib/libmport/db.c	2016-05-30 20:39:16 UTC (rev 7611)
+++ stable/0.8/lib/libmport/db.c	2016-05-30 20:40:17 UTC (rev 7612)
@@ -192,6 +192,8 @@
 int
 mport_upgrade_master_schema(sqlite3 *db, int databaseVersion) 
 {
+	if (databaseVersion == MPORT_MASTER_VERSION)
+		return MPORT_OK;
 
 	switch (databaseVersion) {
 		case 0:
@@ -198,12 +200,18 @@
 		case 1:
 			mport_upgrade_master_schema_0to2(db);
 			mport_upgrade_master_schema_2to3(db);
+			mport_upgrade_master_schema_4to6(db);
+			mport_set_database_version(db);
+			break;
 		case 2:
 			mport_upgrade_master_schema_2to3(db);
 		case 3:
 			mport_upgrade_master_schema_3to4(db);
+			mport_upgrade_master_schema_4to6(db);
+			mport_set_database_version(db);
 			break;
 		case 4:
+			/* falls through */
 		case 5:
 			mport_upgrade_master_schema_4to6(db);
 			mport_set_database_version(db);