summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchrisw <unknown>2010-09-16 00:40:48 +0100
committerchrisw <unknown>2010-09-16 00:40:48 +0100
commiteb6e2eea24fc704e355589e78826b9c2cb15b097 (patch)
treeb47e601b23c97fd36b5963f3b9f9d6d2fd6ec36d
parentdc5bbffcfd4fc59998c09ebe5d33cbae72f95de5 (diff)
parente03cabc49a48876d7543a90d25f8ef35cc9f08c6 (diff)
downloadsqlalchemy-migrate-eb6e2eea24fc704e355589e78826b9c2cb15b097.tar.gz
merge
-rw-r--r--TODO2
-rw-r--r--docs/changelog.rst2
-rw-r--r--migrate/versioning/shell.py5
3 files changed, 8 insertions, 1 deletions
diff --git a/TODO b/TODO
index 44d94f0..da88c94 100644
--- a/TODO
+++ b/TODO
@@ -17,6 +17,8 @@ Unknown milestone
- bash autocompletion
- clarify ImportError in load_model
- implement debug flag to jump into the error
+- sqlautocode support
+- serializers (json, yaml, etc)
0.6.1
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 10f95f5..c1a2eeb 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -25,6 +25,8 @@ Fixed bugs
- fixed bug when dropping columns with unique constraints in sqlite
- rewrite of the schema diff internals, now supporting column
differences in additon to missing columns and tables.
+- fixed bug when passing empty list in
+ :func:`migrate.versioning.shell.main` failed
0.6 (11.07.2010)
---------------------------
diff --git a/migrate/versioning/shell.py b/migrate/versioning/shell.py
index 2d36c42..ad7b679 100644
--- a/migrate/versioning/shell.py
+++ b/migrate/versioning/shell.py
@@ -64,7 +64,10 @@ def main(argv=None, **kwargs):
:param disable_logging: Let migrate configure logging
:type disable_logging: bool
"""
- argv = argv or list(sys.argv[1:])
+ if argv is not None:
+ argv = argv
+ else:
+ argv = list(sys.argv[1:])
commands = list(api.__all__)
commands.sort()