Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Django and SQLAlchemy APIs are failing to use rowcount #654

Merged
merged 3 commits into from Jan 6, 2022
Merged

fix: Django and SQLAlchemy APIs are failing to use rowcount #654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7352b0e
fix: Django and SQLAlchemy APIs are failing to use rowcount
Dec 24, 2021
696c076
lint fix
Dec 24, 2021
0f8960f
Merge branch 'main' into rowcount
vi3k6i5 Jan 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 4 additions & 9 deletions google/cloud/spanner_dbapi/cursor.py
View file
Open in desktop
Expand Up @@ -14,7 +14,6 @@

"""Database cursor for Google Cloud Spanner DB API."""

import warnings
from collections import namedtuple

import sqlparse
Expand Down Expand Up @@ -137,15 +136,11 @@ def description(self):
def rowcount(self):
"""The number of rows produced by the last `execute()` call.

:raises: :class:`NotImplemented`.
The property is non-operational and always returns -1. Request
resulting rows are streamed by the `fetch*()` methods and
can't be counted before they are all streamed.
"""
warnings.warn(
"The `rowcount` property is non-operational. Request "
"resulting rows are streamed by the `fetch*()` methods "
"and can't be counted before they are all streamed.",
UserWarning,
stacklevel=2,
)
return -1

@check_not_closed
def callproc(self, procname, args=None):
Expand Down
12 changes: 2 additions & 10 deletions tests/unit/spanner_dbapi/test_cursor.py
View file
Open in desktop
Expand Up @@ -61,19 +61,11 @@ def test_property_description(self):
self.assertIsNotNone(cursor.description)
self.assertIsInstance(cursor.description[0], ColumnInfo)

@mock.patch("warnings.warn")
def test_property_rowcount(self, warn_mock):
def test_property_rowcount(self):
connection = self._make_connection(self.INSTANCE, self.DATABASE)
cursor = self._make_one(connection)

cursor.rowcount
warn_mock.assert_called_once_with(
"The `rowcount` property is non-operational. Request "
"resulting rows are streamed by the `fetch*()` methods "
"and can't be counted before they are all streamed.",
UserWarning,
stacklevel=2,
)
assert cursor.rowcount == -1

def test_callproc(self):
from google.cloud.spanner_dbapi.exceptions import InterfaceError
Expand Down