From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Wed, 12 Mar 2014 19:09:48 +0000 (-0400)
Subject: :paramref:`.MetaData.naming_convention` feature will now also
X-Git-Tag: rel_0_9_4~65
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7ef7eccaacae5341bb03a58cc0538718c33c329;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

:paramref:`.MetaData.naming_convention` feature will now also
apply to :class:`.CheckConstraint` objects that are associated
directly with a :class:`.Column` instead of just on the
:class:`.Table`.
---

diff --git a/doc/build/changelog/changelog_09.rst b/doc/build/changelog/changelog_09.rst
index 2a8c24f91e..20a0b656d1 100644
--- a/doc/build/changelog/changelog_09.rst
+++ b/doc/build/changelog/changelog_09.rst
@@ -14,6 +14,14 @@
 .. changelog::
     :version: 0.9.4
 
+    .. change::
+        :tags: bug, sql
+
+        :paramref:`.MetaData.naming_convention` feature will now also
+        apply to :class:`.CheckConstraint` objects that are associated
+        directly with a :class:`.Column` instead of just on the
+        :class:`.Table`.
+
     .. change::
         :tags: bug, sql
         :tickets: 2991
diff --git a/lib/sqlalchemy/sql/naming.py b/lib/sqlalchemy/sql/naming.py
index bbb8431211..3ba7f51059 100644
--- a/lib/sqlalchemy/sql/naming.py
+++ b/lib/sqlalchemy/sql/naming.py
@@ -10,7 +10,7 @@
 """
 
 from .schema import Constraint, ForeignKeyConstraint, PrimaryKeyConstraint, \
-                UniqueConstraint, CheckConstraint, Index, Table
+                UniqueConstraint, CheckConstraint, Index, Table, Column
 from .. import event, events
 from .. import exc
 from .elements import _truncated_label
@@ -107,7 +107,14 @@ def _get_convention(dict_, key):
 @event.listens_for(Constraint, "after_parent_attach")
 @event.listens_for(Index, "after_parent_attach")
 def _constraint_name(const, table):
-    if isinstance(table, Table):
+    if isinstance(table, Column):
+        # for column-attached constraint, set another event
+        # to link the column attached to the table as this constraint
+        # associated with the table.
+        event.listen(table, "after_parent_attach",
+                    lambda col, table: _constraint_name(const, table)
+                )
+    elif isinstance(table, Table):
         metadata = table.metadata
         convention = _get_convention(metadata.naming_convention, type(const))
         if convention is not None:
diff --git a/test/sql/test_metadata.py b/test/sql/test_metadata.py
index fd166bc17a..978f4f1f4e 100644
--- a/test/sql/test_metadata.py
+++ b/test/sql/test_metadata.py
@@ -2679,6 +2679,23 @@ class NamingConventionTest(fixtures.TestBase):
             CheckConstraint, u1.c.data == 'x'
         )
 
+    def test_column_attached_ck_name(self):
+        m = MetaData(naming_convention={
+                        "ck": "ck_%(table_name)s_%(constraint_name)s"
+                    })
+        ck = CheckConstraint('x > 5', name='x1')
+        Table('t', m, Column('x', ck))
+        eq_(ck.name, "ck_t_x1")
+
+    def test_table_attached_ck_name(self):
+        m = MetaData(naming_convention={
+                        "ck": "ck_%(table_name)s_%(constraint_name)s"
+                    })
+        ck = CheckConstraint('x > 5', name='x1')
+        Table('t', m, Column('x', Integer), ck)
+        eq_(ck.name, "ck_t_x1")
+
+
     def test_fk_name_schema(self):
         u1 = self._fixture(naming_convention={
                 "fk": "fk_%(table_name)s_%(column_0_name)s_"