From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 30 Jan 2011 18:09:45 +0000 (-0500)
Subject:   - Column.copy(), as used in table.tometadata(), copies the
X-Git-Tag: rel_0_7b1~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c1ff92fa920374195578a8edaef75d96d37f415;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

  - Column.copy(), as used in table.tometadata(), copies the
    'doc' attribute.  [ticket:2028]
---

diff --git a/CHANGES b/CHANGES
index 963addd967..210bfbc519 100644
--- a/CHANGES
+++ b/CHANGES
@@ -174,6 +174,12 @@ CHANGES
   - New dialect for Drizzle, a MySQL variant.  Uses MySQL-python
     for the DBAPI.  [ticket:2003]
 
+0.6.7
+=====
+- sql
+  - Column.copy(), as used in table.tometadata(), copies the 
+    'doc' attribute.  [ticket:2028]
+
 0.6.6
 =====
 - orm
diff --git a/lib/sqlalchemy/schema.py b/lib/sqlalchemy/schema.py
index cf39d29ace..cfed006103 100644
--- a/lib/sqlalchemy/schema.py
+++ b/lib/sqlalchemy/schema.py
@@ -888,6 +888,7 @@ class Column(SchemaItem, expression.ColumnClause):
                 onupdate=self.onupdate,
                 server_onupdate=self.server_onupdate,
                 info=self.info,
+                doc=self.doc,
                 *args
                 )
         if hasattr(self, '_table_events'):
diff --git a/test/sql/test_metadata.py b/test/sql/test_metadata.py
index 3459990fb0..db087331ae 100644
--- a/test/sql/test_metadata.py
+++ b/test/sql/test_metadata.py
@@ -49,14 +49,15 @@ class MetaDataTest(TestBase, ComparesTables):
             Column(Integer(), primary_key=True),
             Column('bar', Integer(), Sequence('foo_seq'), primary_key=True,
                                                             key='bar'),
-            Column(Integer(), ForeignKey('bat.blah')),
+            Column(Integer(), ForeignKey('bat.blah'), doc="this is a col"),
             Column('bar', Integer(), ForeignKey('bat.blah'), primary_key=True,
                                                             key='bar'),
             Column('bar', Integer(), info={'foo':'bar'}),
         ]:
             c2 = col.copy()
             for attr in ('name', 'type', 'nullable', 
-                        'primary_key', 'key', 'unique', 'info'):
+                        'primary_key', 'key', 'unique', 'info',
+                        'doc'):
                 eq_(getattr(col, attr), getattr(c2, attr))
             eq_(len(col.foreign_keys), len(c2.foreign_keys))
             if col.default: