Merge pull request #2063 from OpenBazaar/brian.migrationerror

Potential fix for migration failures

Author: cpacia

repo/migrations/Migration028.go

@@ -258,11 +258,20 @@ func (migrateListingsToV5Schema) Up(repoPath, databasePassword string, testnetEn
 			Indent: "    ",
 		}
 
-		var oldListingIndex []MigrateListingsToV5Schema_V4ListingIndexData
+		var listingIndex []MigrateListingsToV5Schema_V5ListingIndexData
 		listingsJSON, err := ioutil.ReadFile(listingsFilePath)
 		if err != nil {
 			return err
 		}
+		if err = json.Unmarshal(listingsJSON, &listingIndex); err == nil {
+			return writeRepoVer(repoPath, 28)
+		}
+
+		var oldListingIndex []MigrateListingsToV5Schema_V4ListingIndexData
+		listingsJSON, err = ioutil.ReadFile(listingsFilePath)
+		if err != nil {
+			return err
+		}
 		if err = json.Unmarshal(listingsJSON, &oldListingIndex); err != nil {
 			return err
 		}

repo/migrations/Migration033.go

@@ -68,6 +68,13 @@ func (Migration033) Up(repoPath, databasePassword string, testnetEnabled bool) e
 		return err
 	}
 	if _, err = tx.Exec(upSequence); err != nil {
+		if err.Error() == "duplicate column name: err" {
+			err = writeRepoVer(repoPath, migrationCreateMessagesAM09UpVer)
+			if err != nil {
+				return err
+			}
+			return nil
+		}
 		if rErr := tx.Rollback(); rErr != nil {
 			return fmt.Errorf("rollback failed: (%s) due to (%s)", rErr.Error(), err.Error())
 		}