-
-
Notifications
You must be signed in to change notification settings - Fork 253
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
"revision_environment=true", causes env.py to be run unconditionally when the "revision" command is run, to support script.py.mako templates with dependencies on custom "template_args". - [feature] Added "template_args" option to configure() so that an env.py can add additional arguments to the template context when running the "revision" command. This requires either --autogenerate or the configuration directive "revision_environment=true".
- Loading branch information
Showing
10 changed files
with
187 additions
and
77 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,77 +1,126 @@ | ||
| from tests import clear_staging_env, staging_env, eq_, ne_, is_ | ||
| from tests import _no_sql_testing_config, env_file_fixture, script_file_fixture | ||
| from alembic import command | ||
| from alembic.script import ScriptDirectory | ||
| from alembic.environment import EnvironmentContext | ||
| from alembic import util | ||
| import os | ||
| import unittest | ||
|
|
||
| class GeneralOrderedTests(unittest.TestCase): | ||
| def test_001_environment(self): | ||
| assert_set = set(['env.py', 'script.py.mako', 'README']) | ||
| eq_( | ||
| assert_set.intersection(os.listdir(env.dir)), | ||
| assert_set | ||
| ) | ||
|
|
||
| def test_002_rev_ids(self): | ||
| global abc, def_ | ||
| abc = util.rev_id() | ||
| def_ = util.rev_id() | ||
| ne_(abc, def_) | ||
|
|
||
| def test_003_heads(self): | ||
| eq_(env.get_heads(), []) | ||
|
|
||
| def test_004_rev(self): | ||
| script = env.generate_revision(abc, "this is a message", refresh=True) | ||
| eq_(script.doc, "this is a message") | ||
| eq_(script.revision, abc) | ||
| eq_(script.down_revision, None) | ||
| assert os.access( | ||
| os.path.join(env.dir, 'versions', '%s_this_is_a_message.py' % abc), os.F_OK) | ||
| assert callable(script.module.upgrade) | ||
| eq_(env.get_heads(), [abc]) | ||
|
|
||
| def test_005_nextrev(self): | ||
| script = env.generate_revision(def_, "this is the next rev", refresh=True) | ||
| assert os.access( | ||
| os.path.join(env.dir, 'versions', '%s_this_is_the_next_rev.py' % def_), os.F_OK) | ||
| eq_(script.revision, def_) | ||
| eq_(script.down_revision, abc) | ||
| eq_(env._revision_map[abc].nextrev, set([def_])) | ||
| assert script.module.down_revision == abc | ||
| assert callable(script.module.upgrade) | ||
| assert callable(script.module.downgrade) | ||
| eq_(env.get_heads(), [def_]) | ||
|
|
||
| def test_006_from_clean_env(self): | ||
| # test the environment so far with a | ||
| # new ScriptDirectory instance. | ||
|
|
||
| env = staging_env(create=False) | ||
| abc_rev = env._revision_map[abc] | ||
| def_rev = env._revision_map[def_] | ||
| eq_(abc_rev.nextrev, set([def_])) | ||
| eq_(abc_rev.revision, abc) | ||
| eq_(def_rev.down_revision, abc) | ||
| eq_(env.get_heads(), [def_]) | ||
|
|
||
| def test_007_no_refresh(self): | ||
| rid = util.rev_id() | ||
| script = env.generate_revision(rid, "dont' refresh") | ||
| is_(script, None) | ||
| env2 = staging_env(create=False) | ||
| eq_(env2._as_rev_number("head"), rid) | ||
|
|
||
| def test_008_long_name(self): | ||
| rid = util.rev_id() | ||
| script = env.generate_revision(rid, | ||
| "this is a really long name with " | ||
| "lots of characters and also " | ||
| "I'd like it to\nhave\nnewlines") | ||
| assert os.access( | ||
| os.path.join(env.dir, 'versions', '%s_this_is_a_really_lon.py' % rid), os.F_OK) | ||
|
|
||
| @classmethod | ||
| def setup_class(cls): | ||
| global env | ||
| env = staging_env() | ||
|
|
||
| @classmethod | ||
| def teardown_class(cls): | ||
| clear_staging_env() | ||
|
|
||
| class TemplateArgsTest(unittest.TestCase): | ||
| def setUp(self): | ||
| env = staging_env() | ||
| self.cfg = _no_sql_testing_config( | ||
| directives="\nrevision_environment=true\n" | ||
| ) | ||
|
|
||
| def tearDown(self): | ||
| clear_staging_env() | ||
|
|
||
| def test_args_propagate(self): | ||
| config = _no_sql_testing_config() | ||
| script = ScriptDirectory.from_config(config) | ||
| template_args = {"x":"x1", "y":"y1", "z":"z1"} | ||
| env = EnvironmentContext( | ||
| config, | ||
| script, | ||
| template_args = template_args | ||
| ) | ||
| mig_env = env.configure(dialect_name="sqlite", | ||
| template_args={"y":"y2", "q":"q1"}) | ||
| eq_( | ||
| template_args, | ||
| {"x":"x1", "y":"y2", "z":"z1", "q":"q1"} | ||
| ) | ||
|
|
||
| def test_tmpl_args_revision(self): | ||
| env_file_fixture(""" | ||
| context.configure(dialect_name='sqlite', template_args={"somearg":"somevalue"}) | ||
| """) | ||
| script_file_fixture(""" | ||
| # somearg: ${somearg} | ||
| revision = ${repr(up_revision)} | ||
| down_revision = ${repr(down_revision)} | ||
| """) | ||
| command.revision(self.cfg, message="some rev") | ||
| script = ScriptDirectory.from_config(self.cfg) | ||
| rev = script.get_revision('head') | ||
| text = open(rev.path).read() | ||
| assert "somearg: somevalue" in text | ||
|
|
||
| def test_001_environment(): | ||
| assert_set = set(['env.py', 'script.py.mako', 'README']) | ||
| eq_( | ||
| assert_set.intersection(os.listdir(env.dir)), | ||
| assert_set | ||
| ) | ||
|
|
||
| def test_002_rev_ids(): | ||
| global abc, def_ | ||
| abc = util.rev_id() | ||
| def_ = util.rev_id() | ||
| ne_(abc, def_) | ||
|
|
||
| def test_003_heads(): | ||
| eq_(env.get_heads(), []) | ||
|
|
||
| def test_004_rev(): | ||
| script = env.generate_revision(abc, "this is a message", refresh=True) | ||
| eq_(script.doc, "this is a message") | ||
| eq_(script.revision, abc) | ||
| eq_(script.down_revision, None) | ||
| assert os.access( | ||
| os.path.join(env.dir, 'versions', '%s_this_is_a_message.py' % abc), os.F_OK) | ||
| assert callable(script.module.upgrade) | ||
| eq_(env.get_heads(), [abc]) | ||
|
|
||
| def test_005_nextrev(): | ||
| script = env.generate_revision(def_, "this is the next rev", refresh=True) | ||
| assert os.access( | ||
| os.path.join(env.dir, 'versions', '%s_this_is_the_next_rev.py' % def_), os.F_OK) | ||
| eq_(script.revision, def_) | ||
| eq_(script.down_revision, abc) | ||
| eq_(env._revision_map[abc].nextrev, set([def_])) | ||
| assert script.module.down_revision == abc | ||
| assert callable(script.module.upgrade) | ||
| assert callable(script.module.downgrade) | ||
| eq_(env.get_heads(), [def_]) | ||
|
|
||
| def test_006_from_clean_env(): | ||
| # test the environment so far with a | ||
| # new ScriptDirectory instance. | ||
|
|
||
| env = staging_env(create=False) | ||
| abc_rev = env._revision_map[abc] | ||
| def_rev = env._revision_map[def_] | ||
| eq_(abc_rev.nextrev, set([def_])) | ||
| eq_(abc_rev.revision, abc) | ||
| eq_(def_rev.down_revision, abc) | ||
| eq_(env.get_heads(), [def_]) | ||
|
|
||
| def test_007_no_refresh(): | ||
| rid = util.rev_id() | ||
| script = env.generate_revision(rid, "dont' refresh") | ||
| is_(script, None) | ||
| env2 = staging_env(create=False) | ||
| eq_(env2._as_rev_number("head"), rid) | ||
|
|
||
| def test_008_long_name(): | ||
| rid = util.rev_id() | ||
| script = env.generate_revision(rid, | ||
| "this is a really long name with " | ||
| "lots of characters and also " | ||
| "I'd like it to\nhave\nnewlines") | ||
| assert os.access( | ||
| os.path.join(env.dir, 'versions', '%s_this_is_a_really_lon.py' % rid), os.F_OK) | ||
|
|
||
|
|
||
| def setup(): | ||
| global env | ||
| env = staging_env() | ||
|
|
||
| def teardown(): | ||
| clear_staging_env() |