From 59141d360e70d1a762719206e3cb0220b4c53fef Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Wed, 14 Aug 2013 19:58:34 -0400 Subject: - apply an import refactoring to the ORM as well - rework the event system so that event modules load after their targets, dependencies are reversed - create an improved strategy lookup system for the ORM - rework the ORM to have very few import cycles - move out "importlater" to just util.dependency - other tricks to cross-populate modules in as clear a way as possible --- lib/sqlalchemy/sql/schema.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'lib/sqlalchemy/sql/schema.py') diff --git a/lib/sqlalchemy/sql/schema.py b/lib/sqlalchemy/sql/schema.py index 183b30077..ccab31991 100644 --- a/lib/sqlalchemy/sql/schema.py +++ b/lib/sqlalchemy/sql/schema.py @@ -31,7 +31,7 @@ as components in SQL expressions. import re import inspect from .. import exc, util, event, inspection -from ..events import SchemaEventTarget +from .base import SchemaEventTarget from . import visitors from . import type_api from .base import _bind_or_error, ColumnCollection @@ -2509,7 +2509,18 @@ 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