From fe2045fb1c767436ed1e32359fe005dabead504a Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Thu, 21 Apr 2022 13:27:16 -0400 Subject: fix result.columns() method Fixed issue in :meth:`.Result.columns` method where calling upon :meth:`.Result.columns` with a single index could in some cases, particularly ORM result object cases, cause the :class:`.Result` to yield scalar objects rather than :class:`.Row` objects, as though the :meth:`.Result.scalars` method had been called. In SQLAlchemy 1.4, this scenario emits a warning that the behavior will change in SQLAlchemy 2.0. Fixes: #7953 Change-Id: I3c4ca3eecc2bfc85ad1c38000e5990d6dde80d22 --- lib/sqlalchemy/engine/result.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'lib/sqlalchemy/engine') diff --git a/lib/sqlalchemy/engine/result.py b/lib/sqlalchemy/engine/result.py index 11998e718..71320a583 100644 --- a/lib/sqlalchemy/engine/result.py +++ b/lib/sqlalchemy/engine/result.py @@ -802,12 +802,11 @@ class ResultInternal(InPlaceGenerative, Generic[_R]): self._real_result if self._real_result else cast(Result, self) ) - if real_result._source_supports_scalars and len(indexes) == 1: - self._generate_rows = False - else: - self._generate_rows = True + if not real_result._source_supports_scalars or len(indexes) != 1: self._metadata = self._metadata._reduce(indexes) + assert self._generate_rows + return self @HasMemoized.memoized_attribute -- cgit v1.2.1