Commit af81f2a0 authored by John Davis's avatar John Davis
Browse files

Verify db initialization before running upgrade script

parent def88293

lib/galaxy/model/migrations/scripts.py

+6 −0
Original line number Diff line number Diff line
@@ -253,6 +253,12 @@ class LegacyScripts: 
                elif self.database == "install":

                    self.argv.append("tsi@head")



    def get_db_url(self):

        if self.database in ["galaxy", self.DEFAULT_DB_ARG]:

            return self.gxy_url

        elif self.database == "install":

            return self.tsi_url



    def _rename_arg(self, old_name, new_name) -> None:

        pos = self.argv.index(old_name)

        self.argv[pos] = new_name

scripts/manage_db_adapter.py

+3 −0
Original line number Diff line number Diff line
@@ -25,12 +25,15 @@ sys.path.insert(1, os.path.abspath(os.path.join(os.path.dirname(__file__), os.pa 
from galaxy.model.migrations.scripts import (

    invoke_alembic,

    LegacyScripts,

    verify_database_is_initialized,

)





def run():

    ls = LegacyScripts(sys.argv, os.getcwd())

    ls.run()

    db_url = ls.get_db_url()

    verify_database_is_initialized(db_url)

    invoke_alembic()