From 869620902a5a9a0cfc8e9021e3aa31178f18152c Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Fri, 16 Aug 2013 10:03:05 -0400 Subject: merge error here, though also hedge between explaining about the expressions here vs. hoping they read the class-level docstring --- lib/sqlalchemy/sql/schema.py | 7 ------- 1 file changed, 7 deletions(-) (limited to 'lib/sqlalchemy/sql/schema.py') diff --git a/lib/sqlalchemy/sql/schema.py b/lib/sqlalchemy/sql/schema.py index ccab31991..ce4182c54 100644 --- a/lib/sqlalchemy/sql/schema.py +++ b/lib/sqlalchemy/sql/schema.py @@ -2509,19 +2509,12 @@ class Index(ColumnCollectionMixin, SchemaItem): :param name: The name of the index -<<<<<<< HEAD :param \*expressions: Column expressions to include in the index. The expressions are normally instances of :class:`.Column`, but may also be arbitrary SQL expressions which ultmately refer to a :class:`.Column`. - .. versionadded:: 0.8 :class:`.Index` supports SQL expressions as - well as plain columns. -======= - :param \*expressions: Column or SQL expressions. ->>>>>>> master - :param unique: Defaults to False: create a unique index. -- cgit v1.2.1