The major logic change is here.  If we see a database, now instead of delete / abort, we have "upgrade"