diff options
author | Gerhard Häring <gh@ghaering.de> | 2010-03-05 15:20:03 (GMT) |
---|---|---|
committer | Gerhard Häring <gh@ghaering.de> | 2010-03-05 15:20:03 (GMT) |
commit | f9cee224461273307ca9f8a0e690a527496534ab (patch) | |
tree | c12745138703eba02cc59f892cf9f19db6cd7ff5 /Modules/_sqlite/connection.h | |
parent | 06dbff3b1f16dc232df0190cfed4b3af81aecda3 (diff) | |
download | cpython-f9cee224461273307ca9f8a0e690a527496534ab.zip cpython-f9cee224461273307ca9f8a0e690a527496534ab.tar.gz cpython-f9cee224461273307ca9f8a0e690a527496534ab.tar.bz2 |
Merged new pysqlite version 2.6.0 from trunk.
Diffstat (limited to 'Modules/_sqlite/connection.h')
-rw-r--r-- | Modules/_sqlite/connection.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Modules/_sqlite/connection.h b/Modules/_sqlite/connection.h index af414a0..4075a8d 100644 --- a/Modules/_sqlite/connection.h +++ b/Modules/_sqlite/connection.h @@ -1,6 +1,6 @@ /* connection.h - definitions for the connection type * - * Copyright (C) 2004-2007 Gerhard Häring <gh@ghaering.de> + * Copyright (C) 2004-2010 Gerhard Häring <gh@ghaering.de> * * This file is part of pysqlite. * @@ -63,17 +63,21 @@ typedef struct * used from the same thread it was created in */ int check_same_thread; + int initialized; + /* thread identification of the thread the connection was created in */ long thread_ident; pysqlite_Cache* statement_cache; - /* A list of weak references to statements used within this connection */ + /* Lists of weak references to statements and cursors used within this connection */ PyObject* statements; + PyObject* cursors; - /* a counter for how many statements were created in the connection. May be + /* Counters for how many statements/cursors were created in the connection. May be * reset to 0 at certain intervals */ int created_statements; + int created_cursors; PyObject* row_factory; @@ -120,6 +124,7 @@ PyObject* pysqlite_connection_rollback(pysqlite_Connection* self, PyObject* args PyObject* pysqlite_connection_new(PyTypeObject* type, PyObject* args, PyObject* kw); int pysqlite_connection_init(pysqlite_Connection* self, PyObject* args, PyObject* kwargs); +int pysqlite_connection_register_cursor(pysqlite_Connection* connection, PyObject* cursor); int pysqlite_check_thread(pysqlite_Connection* self); int pysqlite_check_connection(pysqlite_Connection* con); |