From 2d99452af57df94e12b8beb70579462dd1eef0e6 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Mon, 25 Mar 2019 15:54:10 -0400 Subject: [PATCH] Fix argv handling in srht-migrate --- srht-migrate | 2 +- srht/database.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/srht-migrate b/srht-migrate index c983751..c036d4f 100755 --- a/srht-migrate +++ b/srht-migrate @@ -2,4 +2,4 @@ import srht.alembic import sys from srht.database import alembic -alembic(sys.argv[1], srht.alembic) +alembic(sys.argv[1], srht.alembic, sys.argv[2:]) diff --git a/srht/database.py b/srht/database.py index 205c7cd..7552c6b 100644 --- a/srht/database.py +++ b/srht/database.py @@ -43,7 +43,7 @@ class DbSession(): def create(self): Base.metadata.create_all(bind=self.engine) -def alembic(site, alembic_module): +def alembic(site, alembic_module, argv=None): """ Automatically rigs up the Alembic config and shells out to it. """ @@ -53,7 +53,9 @@ def alembic(site, alembic_module): help="Specify -a to check config for automatic migrations and abort if " "unset (generally only package post-upgrade scripts will specify " "this)") - options = cmdline.parser.parse_args(sys.argv[1:]) + if argv == None: + argv = sys.argv[1:] + options = cmdline.parser.parse_args(argv) if options.auto: if cfg(site, "migrate-on-upgrade", default="no") != "yes": print("Skipping automatic database migrations")