psycopg/psycopg2
1
1
Fork 0
mirror of https://github.com/psycopg/psycopg2.git synced 2025-11-04 09:47:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

Invalidate large objects after a two-phase commit operation

Browse Source
This commit is contained in:
Daniele Varrazzo 2011-01-10 00:20:20 +00:00
parent 935c25730a
commit 48588e5f69
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
psycopg/pqpath.c
View File

@ -610,6 +610,8 @@ pq_tpc_command_locked(connectionObject *conn, const char *cmd, const char *tid,
Dprintf("_pq_tpc_command: pgconn = %p, command = %s", Dprintf("_pq_tpc_command: pgconn = %p, command = %s",
conn->pgconn, cmd); conn->pgconn, cmd);
conn->mark += 1;
/* convert the xid into the postgres transaction_id and quote it. */ /* convert the xid into the postgres transaction_id and quote it. */
if (!(etid = psycopg_escape_string((PyObject *)conn, tid, 0, NULL, NULL))) if (!(etid = psycopg_escape_string((PyObject *)conn, tid, 0, NULL, NULL)))
{ goto exit; } { goto exit; }

29
tests/test_lobject.py
View File

@ -25,7 +25,7 @@
import os import os
import shutil import shutil
import tempfile import tempfile
from testutils import unittest, decorate_all_tests from testutils import unittest, decorate_all_tests, skip_if_tpc_disabled
import psycopg2 import psycopg2
import psycopg2.extensions import psycopg2.extensions
@ -53,7 +53,7 @@ def skip_if_green(f):
class LargeObjectMixin(object): class LargeObjectMixin(object):
# doesn't derive from TestCase to avoid repeating tests twice. # doesn't derive from TestCase to avoid repeating tests twice.
def setUp(self): def setUp(self):
self.conn = psycopg2.connect(tests.dsn) self.conn = self.connect()
self.lo_oid = None self.lo_oid = None
self.tmpdir = None self.tmpdir = None
@ -74,6 +74,9 @@ class LargeObjectMixin(object):
lo.unlink() lo.unlink()
self.conn.close() self.conn.close()
def connect(self):
return psycopg2.connect(tests.dsn)
class LargeObjectTests(LargeObjectMixin, unittest.TestCase): class LargeObjectTests(LargeObjectMixin, unittest.TestCase):
def test_create(self): def test_create(self):
@ -312,6 +315,28 @@ class LargeObjectTests(LargeObjectMixin, unittest.TestCase):
self.assertTrue(os.path.exists(filename)) self.assertTrue(os.path.exists(filename))
self.assertEqual(open(filename, "rb").read(), "some data") self.assertEqual(open(filename, "rb").read(), "some data")
@skip_if_tpc_disabled
def test_read_after_tpc_commit(self):
self.conn.tpc_begin('test_lobject')
lo = self.conn.lobject()
self.lo_oid = lo.oid
self.conn.tpc_commit()
self.assertRaises(psycopg2.ProgrammingError, lo.read, 5)
@skip_if_tpc_disabled
def test_read_after_tpc_prepare(self):
self.conn.tpc_begin('test_lobject')
lo = self.conn.lobject()
self.lo_oid = lo.oid
self.conn.tpc_prepare()
try:
self.assertRaises(psycopg2.ProgrammingError, lo.read, 5)
finally:
self.conn.tpc_commit()
decorate_all_tests(LargeObjectTests, skip_if_no_lo) decorate_all_tests(LargeObjectTests, skip_if_no_lo)
decorate_all_tests(LargeObjectTests, skip_if_green) decorate_all_tests(LargeObjectTests, skip_if_green)