[Python-checkins] r81632 - in python/branches/py3k: Doc/library/sqlite3.rst Doc/whatsnew/3.2.rst Lib/sqlite3/test/dbapi.py Misc/ACKS Misc/NEWS Modules/_sqlite/connection.c
r.david.murray
python-checkins at python.org
Tue Jun 1 03:32:12 CEST 2010
Author: r.david.murray
Date: Tue Jun 1 03:32:12 2010
New Revision: 81632
Log:
#8845: expose sqlite3 inTransaction as RO in_transaction Connection attribute.
Patch by R. David Murray, unit tests by Shashwat Anand.
Modified:
python/branches/py3k/Doc/library/sqlite3.rst
python/branches/py3k/Doc/whatsnew/3.2.rst
python/branches/py3k/Lib/sqlite3/test/dbapi.py
python/branches/py3k/Misc/ACKS
python/branches/py3k/Misc/NEWS
python/branches/py3k/Modules/_sqlite/connection.c
Modified: python/branches/py3k/Doc/library/sqlite3.rst
==============================================================================
--- python/branches/py3k/Doc/library/sqlite3.rst (original)
+++ python/branches/py3k/Doc/library/sqlite3.rst Tue Jun 1 03:32:12 2010
@@ -227,6 +227,13 @@
one of "DEFERRED", "IMMEDIATE" or "EXCLUSIVE". See section
:ref:`sqlite3-controlling-transactions` for a more detailed explanation.
+.. attribute:: Connection.in_transaction
+
+ .. versionadded:: 3.2
+
+ :cont:`True` if a transaction is active (there are uncommitted changes),
+ :const:`False` otherwise. Read-only attribute.
+
.. method:: Connection.cursor([cursorClass])
@@ -806,7 +813,8 @@
before executing that command. There are two reasons for doing that. The first
is that some of these commands don't work within transactions. The other reason
is that sqlite3 needs to keep track of the transaction state (if a transaction
-is active or not).
+is active or not). The current transaction state is exposed through the
+:attr:`Connection.in_transaction` attribute of the connection object.
You can control which kind of ``BEGIN`` statements sqlite3 implicitly executes
(or none at all) via the *isolation_level* parameter to the :func:`connect`
Modified: python/branches/py3k/Doc/whatsnew/3.2.rst
==============================================================================
--- python/branches/py3k/Doc/whatsnew/3.2.rst (original)
+++ python/branches/py3k/Doc/whatsnew/3.2.rst Tue Jun 1 03:32:12 2010
@@ -100,6 +100,18 @@
(Contributed by Tarek Ziade.)
+* The *sqlite3* module has some new features:
+
+ * XXX *enable_load_extension*
+
+ * XXX *load_extension*
+
+ * New :class:`~sqlite3.Connection` attribute
+ :attr:`~sqlite3.Connection.in_transaction` is :const:`True` when there
+ are uncommitted changes, and :const:`False` otherwise. (Contributed
+ by R. David Murray and Shashwat Anand, :issue:`8845`.)
+
+
Multi-threading
===============
Modified: python/branches/py3k/Lib/sqlite3/test/dbapi.py
==============================================================================
--- python/branches/py3k/Lib/sqlite3/test/dbapi.py (original)
+++ python/branches/py3k/Lib/sqlite3/test/dbapi.py Tue Jun 1 03:32:12 2010
@@ -84,6 +84,7 @@
"NotSupportedError is not a subclass of DatabaseError")
class ConnectionTests(unittest.TestCase):
+
def setUp(self):
self.cx = sqlite.connect(":memory:")
cu = self.cx.cursor()
@@ -140,6 +141,28 @@
self.assertEqual(self.cx.ProgrammingError, sqlite.ProgrammingError)
self.assertEqual(self.cx.NotSupportedError, sqlite.NotSupportedError)
+ def CheckInTransaction(self):
+ # Can't use db from setUp because we want to test initial state.
+ cx = sqlite.connect(":memory:")
+ cu = cx.cursor()
+ self.assertEqual(cx.in_transaction, False)
+ cu.execute("create table transactiontest(id integer primary key, name text)")
+ self.assertEqual(cx.in_transaction, False)
+ cu.execute("insert into transactiontest(name) values (?)", ("foo",))
+ self.assertEqual(cx.in_transaction, True)
+ cu.execute("select name from transactiontest where name=?", ["foo"])
+ row = cu.fetchone()
+ self.assertEqual(cx.in_transaction, True)
+ cx.commit()
+ self.assertEqual(cx.in_transaction, False)
+ cu.execute("select name from transactiontest where name=?", ["foo"])
+ row = cu.fetchone()
+ self.assertEqual(cx.in_transaction, False)
+
+ def CheckInTransactionRO(self):
+ with self.assertRaises(AttributeError):
+ self.cx.in_transaction = True
+
class CursorTests(unittest.TestCase):
def setUp(self):
self.cx = sqlite.connect(":memory:")
Modified: python/branches/py3k/Misc/ACKS
==============================================================================
--- python/branches/py3k/Misc/ACKS (original)
+++ python/branches/py3k/Misc/ACKS Tue Jun 1 03:32:12 2010
@@ -19,6 +19,7 @@
Kevin Altis
Joe Amenta
Mark Anacker
+Shashwat Anand
Anders Andersen
John Anderson
Erik Andersén
Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS (original)
+++ python/branches/py3k/Misc/NEWS Tue Jun 1 03:32:12 2010
@@ -398,6 +398,9 @@
Library
-------
+- Issue #8845: sqlite3 Connection objects now have a read-only in_transaction
+ attribute that is True iff there are uncommitted changes.
+
- Issue #1289118: datetime.timedelta objects can now be multiplied by float
and divided by float and int objects. Results are rounded to the nearest
multiple of timedelta.resolution with ties resolved using round-half-to-even
Modified: python/branches/py3k/Modules/_sqlite/connection.c
==============================================================================
--- python/branches/py3k/Modules/_sqlite/connection.c (original)
+++ python/branches/py3k/Modules/_sqlite/connection.c Tue Jun 1 03:32:12 2010
@@ -23,6 +23,7 @@
#include "cache.h"
#include "module.h"
+#include "structmember.h"
#include "connection.h"
#include "statement.h"
#include "cursor.h"
@@ -1551,6 +1552,7 @@
{"NotSupportedError", T_OBJECT, offsetof(pysqlite_Connection, NotSupportedError), READONLY},
{"row_factory", T_OBJECT, offsetof(pysqlite_Connection, row_factory)},
{"text_factory", T_OBJECT, offsetof(pysqlite_Connection, text_factory)},
+ {"in_transaction", T_BOOL, offsetof(pysqlite_Connection, inTransaction), READONLY},
{NULL}
};
More information about the Python-checkins
mailing list