From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Mon, 14 Oct 2019 14:15:49 +0000 (-0400)
Subject: Repair Variant argument order
X-Git-Tag: rel_1_3_0~2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00616cbf54a57d8e1be84aa6cf34221f535a2e21;p=thirdparty%2Fsqlalchemy%2Falembic.git

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 81016370..d9aba004 100644
--- 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
index 00000000..a5d5141e
--- /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 6202a4f2..f6229c96 100644
--- 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):