summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormike bayer <mike_mp@zzzcomputing.com>2023-02-15 18:22:05 +0000
committerGerrit Code Review <gerrit@bbpush.zzzcomputing.com>2023-02-15 18:22:05 +0000
commitc690d08bf77724159e9dc8542e12eef57604b2ad (patch)
tree3afbae0a960a364b90db680a78b38d71e12b6149
parent9a477ef054e3da35513a368b7b82c52cd6b723ca (diff)
parentf5aba011f6b1ea868f14bc03b5c1beb09262c8b8 (diff)
downloadalembic-c690d08bf77724159e9dc8542e12eef57604b2ad.tar.gz
Merge "restore config object to merge command" into main
-rw-r--r--alembic/command.py2
-rw-r--r--docs/build/unreleased/merge_cfg.rst7
2 files changed, 8 insertions, 1 deletions
diff --git a/alembic/command.py b/alembic/command.py
index d2c5c85..a8e5657 100644
--- a/alembic/command.py
+++ b/alembic/command.py
@@ -322,7 +322,7 @@ def merge(
script = ScriptDirectory.from_config(config)
template_args = {
- "config": "config" # Let templates use config for
+ "config": config # Let templates use config for
# e.g. multiple databases
}
return script.generate_revision(
diff --git a/docs/build/unreleased/merge_cfg.rst b/docs/build/unreleased/merge_cfg.rst
new file mode 100644
index 0000000..4a2df78
--- /dev/null
+++ b/docs/build/unreleased/merge_cfg.rst
@@ -0,0 +1,7 @@
+.. change::
+ :tags: bug, commands
+
+ Fixed regression introduced in 1.7.0 where the "config" object passed to
+ the template context when running the :func:`.merge` command
+ programmatically failed to be correctly populated. Pull request courtesy
+ Brendan Gann.