From ecfda6512cf8a50238529168932586444b657954 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Wed, 25 Jan 2017 13:30:47 -0500 Subject: Add count(), scalar() to baked query Change-Id: I8af0d7b41ae2df384ce5d0ef274732352d81f376 Fixes: #3897 --- lib/sqlalchemy/ext/baked.py | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/sqlalchemy/ext/baked.py b/lib/sqlalchemy/ext/baked.py index c329eb47b..090466618 100644 --- a/lib/sqlalchemy/ext/baked.py +++ b/lib/sqlalchemy/ext/baked.py @@ -17,7 +17,7 @@ from ..orm.query import Query from ..orm import strategies, attributes, properties, \ strategy_options, util as orm_util, interfaces from .. import log as sqla_log -from ..sql import util as sql_util +from ..sql import util as sql_util, func, literal_column from ..orm import exc as orm_exc from .. import exc as sa_exc from .. import util @@ -254,6 +254,40 @@ class Result(object): return context.query.params(self._params).\ with_session(self.session)._execute_and_instances(context) + def count(self): + """return the 'count'. + + Equivalent to :meth:`.Query.count`. + + Note this uses a subquery to ensure an accurate count regardless + of the structure of the original statement. + + .. versionadded:: 1.1.6 + + """ + + col = func.count(literal_column('*')) + bq = self.bq.with_criteria(lambda q: q.from_self(col)) + return bq.for_session(self.session).scalar() + + def scalar(self): + """Return the first element of the first result or None + if no rows present. If multiple rows are returned, + raises MultipleResultsFound. + + Equivalent to :meth:`.Query.scalar`. + + .. versionadded:: 1.1.6 + + """ + try: + ret = self.one() + if not isinstance(ret, tuple): + return ret + return ret[0] + except orm_exc.NoResultFound: + return None + def first(self): """Return the first row. -- cgit v1.2.1