From: Nicolas CANIART <nicolas@caniart.net>
Date: Tue, 31 Oct 2017 15:34:10 +0000 (-0400)
Subject: Accommodate tuples for ColumnDefault.__repr__
X-Git-Tag: rel_1_1_15~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d91edf25115c12be28ee7e2cd5fe557c1dcaf8d1;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Accommodate tuples for ColumnDefault.__repr__

Fixed bug where ``__repr__`` of :class:`.ColumnDefault` would fail
if the argument were a tuple.  Pull request courtesy Nicolas Caniart.

Change-Id: I08aa2448ef91054c43d6068ac54cedbdf7a83d64
Pull-request: https://bitbucket.org/zzzeek/sqlalchemy/pull-requests/1
Fixes: #4126
(cherry picked from commit 5acc9b149a4f7c44b8e7fbe926c0c5de8f13b2c4)
---

diff --git a/doc/build/changelog/unreleased_11/4126.rst b/doc/build/changelog/unreleased_11/4126.rst
new file mode 100644
index 0000000000..f269f1cd53
--- /dev/null
+++ b/doc/build/changelog/unreleased_11/4126.rst
@@ -0,0 +1,7 @@
+.. change::
+    :tags: bug, sql
+    :tickets: 4126
+    :versions: 1.2.0b4
+
+    Fixed bug where ``__repr__`` of :class:`.ColumnDefault` would fail
+    if the argument were a tuple.  Pull request courtesy Nicolas Caniart.
\ No newline at end of file
diff --git a/lib/sqlalchemy/sql/schema.py b/lib/sqlalchemy/sql/schema.py
index 592dc390d3..68baa80b66 100644
--- a/lib/sqlalchemy/sql/schema.py
+++ b/lib/sqlalchemy/sql/schema.py
@@ -2081,7 +2081,7 @@ class ColumnDefault(DefaultGenerator):
     __visit_name__ = property(_visit_name)
 
     def __repr__(self):
-        return "ColumnDefault(%r)" % self.arg
+        return "ColumnDefault(%r)" % (self.arg, )
 
 
 class Sequence(DefaultGenerator):
diff --git a/test/sql/test_metadata.py b/test/sql/test_metadata.py
index 61fbbc57b4..5fac032fa5 100644
--- a/test/sql/test_metadata.py
+++ b/test/sql/test_metadata.py
@@ -550,6 +550,7 @@ class MetaDataTest(fixtures.TestBase, ComparesTables):
              "CheckConstraint("
              "%s"
              ", name='someconstraint')" % repr(ck.sqltext)),
+            (ColumnDefault(('foo', 'bar')), "ColumnDefault(('foo', 'bar'))")
         ):
             eq_(
                 repr(const),