summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2013-10-14 14:53:28 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2013-10-14 14:53:28 -0400
commit78a38967c4ad94194308f77f60a922236cd75227 (patch)
treefba0a49ab71b32d667efea66d065e02bde5c9f4f /lib/sqlalchemy
parentdbde70a3a23505ab462da3da8639ee22691a0788 (diff)
downloadsqlalchemy-78a38967c4ad94194308f77f60a922236cd75227.tar.gz
The ``.unique`` flag on :class:`.Index` could be produced as ``None``
if it was generated from a :class:`.Column` that didn't specify ``unique`` (where it defaults to ``None``). The flag will now always be ``True`` or ``False``. [ticket:2825]
Diffstat (limited to 'lib/sqlalchemy')
-rw-r--r--lib/sqlalchemy/sql/schema.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/sqlalchemy/sql/schema.py b/lib/sqlalchemy/sql/schema.py
index fe331ce2e..90c4fb0dd 100644
--- a/lib/sqlalchemy/sql/schema.py
+++ b/lib/sqlalchemy/sql/schema.py
@@ -977,8 +977,13 @@ class Column(SchemaItem, ColumnClause):
self.default = kwargs.pop('default', None)
self.server_default = kwargs.pop('server_default', None)
self.server_onupdate = kwargs.pop('server_onupdate', None)
+
+ # these default to None because .index and .unique is *not*
+ # an informational flag about Column - there can still be an
+ # Index or UniqueConstraint referring to this Column.
self.index = kwargs.pop('index', None)
self.unique = kwargs.pop('unique', None)
+
self.system = kwargs.pop('system', False)
self.doc = kwargs.pop('doc', None)
self.onupdate = kwargs.pop('onupdate', None)
@@ -1126,7 +1131,7 @@ class Column(SchemaItem, ColumnClause):
"To create indexes with a specific name, create an "
"explicit Index object external to the Table.")
Index(_truncated_label('ix_%s' % self._label),
- self, unique=self.unique)
+ self, unique=bool(self.unique))
elif self.unique:
if isinstance(self.unique, util.string_types):
raise exc.ArgumentError(