Repair Variant argument order

Fixed bug in new Variant autogenerate where the order of the arguments to
Variant were mistakenly reversed.

Change-Id: I15cd7d6a926a71005b8b7b9350279846d2886363
Fixes: #131

diff --git a/alembic/autogenerate/render.py b/alembic/autogenerate/render.py
index 8101637062b0d31e2df3e48fe6519cc272a6a44b..d9aba004b71984e6a3d4d5fb2818c7d60fd30439 100644 (file)
--- a/alembic/autogenerate/render.py
+++ b/alembic/autogenerate/render.py
@@ -702,9 +702,9 @@ def _render_Variant_type(type_, autogen_context):
     base = _repr_type(type_.impl, autogen_context)
     for dialect in sorted(type_.mapping):
         typ = type_.mapping[dialect]
-        base += ".with_variant(%r, %s)" % (
-            dialect,
+        base += ".with_variant(%s, %r)" % (
             _repr_type(typ, autogen_context),
+            dialect,
         )
     return base
 

diff --git a/docs/build/unreleased/131.rst b/docs/build/unreleased/131.rst
new file mode 100644 (file)
index 0000000..a5d5141
--- /dev/null
+++ b/docs/build/unreleased/131.rst
@@ -0,0 +1,6 @@
+.. change::
+    :tags: bug, autogenerate
+    :tickets: 131
+
+    Fixed bug in new Variant autogenerate where the order of the arguments to
+    Variant were mistakenly reversed.

diff --git a/tests/test_autogen_render.py b/tests/test_autogen_render.py
index 6202a4f210320ba021fe0b47e5bf321f364a1b02..f6229c9623d0a179432270286b2a853e21034a2d 100644 (file)
--- a/tests/test_autogen_render.py
+++ b/tests/test_autogen_render.py
@@ -1692,8 +1692,8 @@ class AutogenRenderTest(TestBase):
         eq_ignore_whitespace(
             autogenerate.render._repr_type(type_, self.autogen_context),
             "sa.String(length=5)."
-            "with_variant('mysql', sa.VARCHAR(length=10))."
-            "with_variant('oracle', sa.CHAR(length=15))",
+            "with_variant(sa.VARCHAR(length=10), 'mysql')."
+            "with_variant(sa.CHAR(length=15), 'oracle')",
         )
 
     def test_repr_user_type_user_prefix_None(self):