Config: make sure migration_table option is loaded

Fixes issue #19

3 files changed, 11 insertions, 1 deletions

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index c191bff..6b17d98 100755
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,13 @@
 CHANGELOG
 ---------
 
+5.0.2
+~~~~~
+
+* Bugfix: make sure that the migration_table option is read from the config
+  file (thanks to Frederik Holljen for the report and Manolo Micozzi for the
+  fix)
+
 5.0.1 (released 2015-11-13)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/yoyo/scripts/main.py b/yoyo/scripts/main.py
index e564872..4142c03 100755
--- a/yoyo/scripts/main.py
+++ b/yoyo/scripts/main.py
@@ -58,6 +58,7 @@ def parse_args(argv=None):
                    'sources': 'get',
                    'database': 'get',
                    'verbosity': 'getint',
+                   'migration_table': 'get',
                    }
 
     globalparser, argparser, subparsers = make_argparser()
diff --git a/yoyo/tests/test_cli_script.py b/yoyo/tests/test_cli_script.py
index d9a247e..51106a8 100644
--- a/yoyo/tests/test_cli_script.py
+++ b/yoyo/tests/test_cli_script.py
@@ -215,10 +215,12 @@ class TestArgParsing(TestInteractiveScript):
 
     def test_it_uses_config_file_defaults(self):
         self.writeconfig(sources='/tmp/migrations',
-                         database='postgresql:///foo')
+                         database='postgresql:///foo',
+                         migration_table='my_migrations')
         _, _, args = parse_args(['apply'])
         assert args.database == 'postgresql:///foo'
         assert args.sources == ['/tmp/migrations']
+        assert args.migration_table == 'my_migrations'
 
     def test_it_uses_interpolated_values_from_config(self):
         self.writeconfig(sources='%(here)s/migrations')