From: Mike Bayer Date: Mon, 23 Jul 2007 22:47:52 +0000 (+0000) Subject: deprecated extra arguments on instances() X-Git-Tag: rel_0_4_6~36 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=42f8aae98d5fce6a635617b26416e68e0baf45a0;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git deprecated extra arguments on instances() --- diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py index 216a1e7b4e..86e6d522f3 100644 --- a/lib/sqlalchemy/orm/query.py +++ b/lib/sqlalchemy/orm/query.py @@ -619,23 +619,9 @@ class Query(object): """Return a list of mapped instances corresponding to the rows in a given *cursor* (i.e. ``ResultProxy``). - \*mappers_or_columns is an optional list containing one or more of - classes, mappers, strings or sql.ColumnElements which will be - applied to each row and added horizontally to the result set, - which becomes a list of tuples. The first element in each tuple - is the usual result based on the mapper represented by this - ``Query``. Each additional element in the tuple corresponds to an - entry in the \*mappers_or_columns list. - - For each element in \*mappers_or_columns, if the element is - a mapper or mapped class, an additional class instance will be - present in the tuple. If the element is a string or sql.ColumnElement, - the corresponding result column from each row will be present in the tuple. - - Note that when \*mappers_or_columns is present, "uniquing" for the result set - is *disabled*, so that the resulting tuples contain entities as they actually - correspond. this indicates that multiple results may be present if this - option is used. + The \*mappers_or_columns and \**kwargs arguments are deprecated. + To add instances or columns to the results, use add_entity() + and add_column(). """ self.__log_debug("instances()")