From 1a62e44c70f954f006896e06737d6cf99d99de60 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Mon, 28 Nov 2011 10:15:26 -0500 Subject: [PATCH] share imports among multi runs in one set --- alembic/autogenerate.py | 3 +-- alembic/command.py | 3 ++- tests/test_autogenerate.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/alembic/autogenerate.py b/alembic/autogenerate.py index 4f81dd7d..62462b25 100644 --- a/alembic/autogenerate.py +++ b/alembic/autogenerate.py @@ -13,7 +13,7 @@ log = logging.getLogger(__name__) ################################################### # top level -def produce_migration_diffs(template_args): +def produce_migration_diffs(template_args, imports): metadata = _context_opts['autogenerate_metadata'] if metadata is None: raise util.CommandError( @@ -22,7 +22,6 @@ def produce_migration_diffs(template_args): "a MetaData object to the context.") connection = get_bind() diffs = [] - imports = set() _produce_net_changes(connection, metadata, diffs) _set_upgrade(template_args, _indent(_produce_upgrade_commands(diffs, imports))) _set_downgrade(template_args, _indent(_produce_downgrade_commands(diffs, imports))) diff --git a/alembic/command.py b/alembic/command.py index ed672b83..a3598ac7 100644 --- a/alembic/command.py +++ b/alembic/command.py @@ -64,11 +64,12 @@ def revision(config, message=None, autogenerate=False): script = ScriptDirectory.from_config(config) template_args = {} + imports = set() if autogenerate: def retrieve_migrations(rev): if script._get_rev(rev) is not script._get_rev("head"): raise util.CommandError("Target database is not up to date.") - autogen.produce_migration_diffs(template_args) + autogen.produce_migration_diffs(template_args, imports) return [] context._opts( diff --git a/tests/test_autogenerate.py b/tests/test_autogenerate.py index 7fd6ea4f..bc8cfea0 100644 --- a/tests/test_autogenerate.py +++ b/tests/test_autogenerate.py @@ -132,7 +132,7 @@ class AutogenerateDiffTest(TestCase): context.configure( connection=connection, autogenerate_metadata=metadata) - autogenerate.produce_migration_diffs(template_args) + autogenerate.produce_migration_diffs(template_args, set()) eq_(template_args['upgrades'], """### commands auto generated by Alembic - please adjust! ### create_table('item', -- 2.47.2