- changelog + test for MigrationContext.config

diff --git a/alembic/migration.py b/alembic/migration.py
index 0fffbe5bbb3d063e7a2557c5f33c47b4f85f7a7d..e5de70f311050074115afc0fb221eaca103a8da2 100644 (file)
--- a/alembic/migration.py
+++ b/alembic/migration.py
@@ -309,7 +309,11 @@ class MigrationContext(object):
 
     @property
     def config(self):
-        """Return the :class:`.Config` used by the current environment, if any."""
+        """Return the :class:`.Config` used by the current environment, if any.
+
+        .. versionadded:: 0.6.6
+
+        """
         if self.environment_context:
             return self.environment_context.config
         else:

diff --git a/docs/build/changelog.rst b/docs/build/changelog.rst
index fb437b6ff6ece3e521f9fe1bcf6aded46b01d13e..1a00cbcbb886b6e0d0229f799e919db434c7b6bf 100644 (file)
--- a/docs/build/changelog.rst
+++ b/docs/build/changelog.rst
@@ -2,6 +2,18 @@
 ==========
 Changelog
 ==========
+.. changelog::
+    :version: 0.6.6
+
+    .. change::
+      :tags: feature
+      :pullreq: github:10
+
+      Added a new accessor :attr:`.MigrationContext.config`, when used
+      in conjunction with a :class:`.EnvironmentContext` and
+      :class:`.Config`, this config will be returned.  Patch
+      courtesy Marc Abramowitz.
+
 .. changelog::
     :version: 0.6.5
     :released: May 3, 2014

diff --git a/tests/test_environment.py b/tests/test_environment.py
index d7a4554a1fe4d4d5c22fd802db17f7bfc62fded8..cc5ccb88b1b4dcdfa4a00ab8949c69441a67c6ee 100644 (file)
--- a/tests/test_environment.py
+++ b/tests/test_environment.py
@@ -1,12 +1,12 @@
 #!coding: utf-8
 
-from alembic.config import Config
 from alembic.script import ScriptDirectory
 from alembic.environment import EnvironmentContext
+from alembic.migration import MigrationContext
 import unittest
 from . import Mock, call, _no_sql_testing_config, staging_env, clear_staging_env
 
-from . import eq_
+from . import eq_, is_
 
 class EnvironmentTest(unittest.TestCase):
     def setUp(self):
@@ -62,3 +62,11 @@ class EnvironmentTest(unittest.TestCase):
             "x"
         )
 
+    def test_migration_context_has_config(self):
+        env = self._fixture()
+        env.configure(url="sqlite://")
+        ctx = env._migration_context
+        is_(ctx.config, self.cfg)
+
+        ctx = MigrationContext(ctx.dialect, None, {})
+        is_(ctx.config, None)