From: Dimitris Theodorou <dimitris.theodorou@gmail.com>
Date: Mon, 12 Jan 2015 01:40:50 +0000 (+0100)
Subject: Add native_enum flag to Enum's repr() result
X-Git-Tag: rel_0_9_9~38
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=125d8998e3e9aaa608ba082aa919da1987353b23;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Add native_enum flag to Enum's repr() result

Needed for alembic autogenerate rendering.

(cherry picked from commit f4b7b02e31e6b49195c21da7221bcbda0bad02b9)

Conflicts:
	test/sql/test_types.py
---

diff --git a/lib/sqlalchemy/sql/sqltypes.py b/lib/sqlalchemy/sql/sqltypes.py
index a7f25bbfa4..c11869f4c4 100644
--- a/lib/sqlalchemy/sql/sqltypes.py
+++ b/lib/sqlalchemy/sql/sqltypes.py
@@ -1145,6 +1145,7 @@ class Enum(String, SchemaType):
 
     def __repr__(self):
         return util.generic_repr(self,
+                                 additional_kw=[('native_enum', True)],
                                  to_inspect=[Enum, SchemaType],
                                  )
 
diff --git a/test/sql/test_types.py b/test/sql/test_types.py
index 20ba9d3ef2..fd7dafc844 100644
--- a/test/sql/test_types.py
+++ b/test/sql/test_types.py
@@ -1155,12 +1155,15 @@ class EnumTest(AssertsCompiledSQL, fixtures.TestBase):
         assert "('x'," in e.print_sql()
 
     def test_repr(self):
-        e = Enum("x", "y", name="somename", convert_unicode=True,
-                 quote=True, inherit_schema=True)
+        e = Enum(
+            "x", "y", name="somename", convert_unicode=True, quote=True,
+            inherit_schema=True, native_enum=False)
         eq_(
             repr(e),
-            "Enum('x', 'y', name='somename', inherit_schema=True)"
-        )
+            "Enum('x', 'y', name='somename', "
+            "inherit_schema=True, native_enum=False)")
+
+binary_table = MyPickleType = metadata = None
 
 
 class BinaryTest(fixtures.TestBase, AssertsExecutionResults):