Skip to content

gh-69093: Add mapping protocol support to sqlite3.Blob #91599

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

Merged
JelleZijlstra merged 10 commits into from
Apr 22, 2022
Merged

gh-69093: Add mapping protocol support to sqlite3.Blob #91599

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
38b2cdb
gh-69093: Add mapping protocol support to sqlite3.Blob
Apr 16, 2022
8bc5762
Merge branch 'main' into sqlite-blob-add-mapping-protocol
Apr 16, 2022
86e324a
Cast
Apr 16, 2022
37a5c38
Assert lenght and offset
Apr 16, 2022
a179749
Accept all buffer objects
Apr 16, 2022
ed6a9b6
Address review: reword docs and modify example
Apr 18, 2022
233f940
bugfix: use correct offset in inner read/write
Apr 18, 2022
9cbc339
Update Misc/NEWS.d/next/Library/2022-04-14-01-00-31.gh-issue-69093.bm…
Apr 19, 2022
7df4b9d
Address review: verify writes
Apr 19, 2022
cb2619e
Address review: Py_ssize_t iso. int
Apr 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions Lib/test/test_sqlite3/test_dbapi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1138,6 +1138,13 @@ def test_blob_write_error_length(self):
with self.assertRaisesRegex(ValueError, "data longer than blob"):
self.blob.write(b"a" * 1000)

self.blob.seek(0, SEEK_SET)
n = len(self.blob)
self.blob.write(b"a" * (n-1))
self.blob.write(b"a" * 1)
with self.assertRaisesRegex(ValueError, "data longer than blob"):
self.blob.write(b"a" * 1)

def test_blob_write_error_row_changed(self):
self.cx.execute("update test set b='aaaa' where rowid=1")
with self.assertRaises(sqlite.OperationalError):
Expand Down Expand Up @@ -1178,6 +1185,15 @@ def test_blob_set_item(self):
actual = self.cx.execute("select b from test").fetchone()[0]
self.assertEqual(actual, expected)

def test_blob_set_item_with_offset(self):
self.blob.seek(0, SEEK_END)
self.assertEqual(self.blob.read(), b"") # verify that we're at EOB
self.blob[0] = b"T"
self.blob[-1] = b"."
self.blob.seek(0, SEEK_SET)
expected = b"This blob data string is exactly fifty bytes long."
self.assertEqual(self.blob.read(), expected)

def test_blob_set_buffer_object(self):
from array import array
self.blob[0] = memoryview(b"1")
Expand Down
6 changes: 3 additions & 3 deletions Modules/_sqlite/blob.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ static PyObject *
inner_read(pysqlite_Blob *self, Py_ssize_t length, Py_ssize_t offset)
{
assert(length <= sqlite3_blob_bytes(self->blob));
assert(offset <= sqlite3_blob_bytes(self->blob) - self->offset);
assert(offset <= sqlite3_blob_bytes(self->blob));

PyObject *buffer = PyBytes_FromStringAndSize(NULL, length);
if (buffer == NULL) {
Expand Down Expand Up @@ -188,13 +188,13 @@ inner_write(pysqlite_Blob *self, const void *buf, Py_ssize_t len,
Py_ssize_t offset)
{
int blob_len = sqlite3_blob_bytes(self->blob);
int remaining_len = blob_len - self->offset;
int remaining_len = blob_len - offset;
if (len > remaining_len) {
PyErr_SetString(PyExc_ValueError, "data longer than blob length");
return -1;
}

assert(offset <= remaining_len);
assert(offset <= blob_len);
int rc;
Py_BEGIN_ALLOW_THREADS
rc = sqlite3_blob_write(self->blob, buf, (int)len, (int)offset);
Expand Down