diff options
author | Mike Bayer <mike_mp@zzzcomputing.com> | 2012-02-12 17:47:36 -0500 |
---|---|---|
committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2012-02-12 17:47:36 -0500 |
commit | d50ea3eabf49a8f881a4a21dbafd471bd6510ba8 (patch) | |
tree | ba97a570a39fc81d162ec44bc0584d0cf30722b5 /lib/sqlalchemy/schema.py | |
parent | fdc92f0226779d608a5082e2f9009a332c142eb1 (diff) | |
download | sqlalchemy-d50ea3eabf49a8f881a4a21dbafd471bd6510ba8.tar.gz |
- [bug] Index will raise when arguments passed
cannot be interpreted as columns or expressions.
Will warn when Index is created
with no columns at all. [ticket:2380]
Diffstat (limited to 'lib/sqlalchemy/schema.py')
-rw-r--r-- | lib/sqlalchemy/schema.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/sqlalchemy/schema.py b/lib/sqlalchemy/schema.py index 83a6e0f37..3ae0053c3 100644 --- a/lib/sqlalchemy/schema.py +++ b/lib/sqlalchemy/schema.py @@ -2195,6 +2195,8 @@ class Index(ColumnCollectionMixin, SchemaItem): self.table = None # will call _set_parent() if table-bound column # objects are present + if not columns: + util.warn("No column names or expressions given for Index.") ColumnCollectionMixin.__init__(self, *columns) self.name = name self.unique = kw.pop('unique', False) @@ -3007,9 +3009,11 @@ def _to_schema_column(element): return element def _to_schema_column_or_string(element): - if hasattr(element, '__clause_element__'): - element = element.__clause_element__() - return element + if hasattr(element, '__clause_element__'): + element = element.__clause_element__() + if not isinstance(element, (basestring, expression.ColumnElement)): + raise exc.ArgumentError("Element %r is not a string name or column element" % element) + return element class _CreateDropBase(DDLElement): """Base class for DDL constucts that represent CREATE and DROP or |