cpython-lru_cache-weakref: Modules/_sqlite/connection.c annotate

annotate Modules/_sqlite/connection.c @ 65035:87f4b32905df 2.7

Cosmetic fix to use print function.

author	Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>
date	Fri, 01 Oct 2010 10:48:47 +0000
parents	6899139301c9
children	b36cb4602e21

rev	line source
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1 /* connection.c - the connection type
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	2 *
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	3 * Copyright (C) 2004-2010 Gerhard Häring <gh@ghaering.de>
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	4 *
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	5 * This file is part of pysqlite.
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	6 *
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	7 * This software is provided 'as-is', without any express or implied
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	8 * warranty. In no event will the authors be held liable for any damages
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	9 * arising from the use of this software.
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	10 *
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	11 * Permission is granted to anyone to use this software for any purpose,
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	12 * including commercial applications, and to alter it and redistribute it
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	13 * freely, subject to the following restrictions:
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	14 *
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	15 * 1. The origin of this software must not be misrepresented; you must not
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	16 * claim that you wrote the original software. If you use this software
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	17 * in a product, an acknowledgment in the product documentation would be
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	18 * appreciated but is not required.
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	19 * 2. Altered source versions must be plainly marked as such, and must not be
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	20 * misrepresented as being the original software.
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	21 * 3. This notice may not be removed or altered from any source distribution.
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	22 */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	23
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	24 #include "cache.h"
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	25 #include "module.h"
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	26 #include "connection.h"
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	27 #include "statement.h"
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	28 #include "cursor.h"
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	29 #include "prepare_protocol.h"
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	30 #include "util.h"
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	31 #include "sqlitecompat.h"
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	32
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	33 #include "pythread.h"
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	34
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	35 #define ACTION_FINALIZE 1
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	36 #define ACTION_RESET 2
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	37
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	38 #if SQLITE_VERSION_NUMBER >= 3003008
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	39 #ifndef SQLITE_OMIT_LOAD_EXTENSION
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	40 #define HAVE_LOAD_EXTENSION
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	41 #endif
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	42 #endif
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	43
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	44 static int pysqlite_connection_set_isolation_level(pysqlite_Connection* self, PyObject* isolation_level);
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	45 static void _pysqlite_drop_unused_cursor_references(pysqlite_Connection* self);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	46
38833 d7bc6470e838 - Added version checks in C code to make sure we don't trigger bugs in older Gerhard Häring <gh@ghaering.de> parents: 38808 diff changeset	47
49154 4c77d1016f60 Fixes issue #3103. In the sqlite3 module, made one more function static. All renaming public symbos now have the pysqlite prefix to avoid name clashes. This at least once created problems where the same symbol name appeared somewhere in Apache and the sqlite3 module was used from mod_python. Gerhard Häring <gh@ghaering.de> parents: 49153 diff changeset	48 static void _sqlite3_result_error(sqlite3_context* ctx, const char* errmsg, int len)
38833 d7bc6470e838 - Added version checks in C code to make sure we don't trigger bugs in older Gerhard Häring <gh@ghaering.de> parents: 38808 diff changeset	49 {
d7bc6470e838 - Added version checks in C code to make sure we don't trigger bugs in older Gerhard Häring <gh@ghaering.de> parents: 38808 diff changeset	50 /* in older SQLite versions, calling sqlite3_result_error in callbacks
d7bc6470e838 - Added version checks in C code to make sure we don't trigger bugs in older Gerhard Häring <gh@ghaering.de> parents: 38808 diff changeset	51 * triggers a bug in SQLite that leads either to irritating results or
d7bc6470e838 - Added version checks in C code to make sure we don't trigger bugs in older Gerhard Häring <gh@ghaering.de> parents: 38808 diff changeset	52 * segfaults, depending on the SQLite version */
d7bc6470e838 - Added version checks in C code to make sure we don't trigger bugs in older Gerhard Häring <gh@ghaering.de> parents: 38808 diff changeset	53 #if SQLITE_VERSION_NUMBER >= 3003003
d7bc6470e838 - Added version checks in C code to make sure we don't trigger bugs in older Gerhard Häring <gh@ghaering.de> parents: 38808 diff changeset	54 sqlite3_result_error(ctx, errmsg, len);
38835 0a8b851b0375 Speculative checkin (requires approval of Gerhard Haering) Neal Norwitz <nnorwitz@gmail.com> parents: 38833 diff changeset	55 #else
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	56 PyErr_SetString(pysqlite_OperationalError, errmsg);
38833 d7bc6470e838 - Added version checks in C code to make sure we don't trigger bugs in older Gerhard Häring <gh@ghaering.de> parents: 38808 diff changeset	57 #endif
d7bc6470e838 - Added version checks in C code to make sure we don't trigger bugs in older Gerhard Häring <gh@ghaering.de> parents: 38808 diff changeset	58 }
d7bc6470e838 - Added version checks in C code to make sure we don't trigger bugs in older Gerhard Häring <gh@ghaering.de> parents: 38808 diff changeset	59
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	60 int pysqlite_connection_init(pysqlite_Connection* self, PyObject* args, PyObject* kwargs)
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	61 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	62 static char *kwlist[] = {"database", "timeout", "detect_types", "isolation_level", "check_same_thread", "factory", "cached_statements", NULL, NULL};
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	63
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	64 PyObject* database;
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	65 int detect_types = 0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	66 PyObject* isolation_level = NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	67 PyObject* factory = NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	68 int check_same_thread = 1;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	69 int cached_statements = 100;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	70 double timeout = 5.0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	71 int rc;
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	72 PyObject* class_attr = NULL;
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	73 PyObject* class_attr_str = NULL;
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	74 int is_apsw_connection = 0;
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	75 PyObject* database_utf8;
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	76
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	77 if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O\|diOiOi", kwlist,
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	78 &database, &timeout, &detect_types, &isolation_level, &check_same_thread, &factory, &cached_statements))
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	79 {
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	80 return -1;
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	81 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	82
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	83 self->initialized = 1;
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	84
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	85 self->begin_statement = NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	86
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	87 self->statement_cache = NULL;
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	88 self->statements = NULL;
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	89 self->cursors = NULL;
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	90
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	91 Py_INCREF(Py_None);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	92 self->row_factory = Py_None;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	93
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	94 Py_INCREF(&PyUnicode_Type);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	95 self->text_factory = (PyObject*)&PyUnicode_Type;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	96
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	97 if (PyString_Check(database) \|\| PyUnicode_Check(database)) {
52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	98 if (PyString_Check(database)) {
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	99 database_utf8 = database;
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	100 Py_INCREF(database_utf8);
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	101 } else {
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	102 database_utf8 = PyUnicode_AsUTF8String(database);
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	103 if (!database_utf8) {
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	104 return -1;
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	105 }
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	106 }
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	107
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	108 Py_BEGIN_ALLOW_THREADS
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	109 rc = sqlite3_open(PyString_AsString(database_utf8), &self->db);
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	110 Py_END_ALLOW_THREADS
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	111
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	112 Py_DECREF(database_utf8);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	113
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	114 if (rc != SQLITE_OK) {
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	115 _pysqlite_seterror(self->db, NULL);
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	116 return -1;
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	117 }
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	118 } else {
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	119 /* Create a pysqlite connection from a APSW connection */
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	120 class_attr = PyObject_GetAttrString(database, "__class__");
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	121 if (class_attr) {
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	122 class_attr_str = PyObject_Str(class_attr);
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	123 if (class_attr_str) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	124 if (strcmp(PyString_AsString(class_attr_str), "<type 'apsw.Connection'>") == 0) {
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	125 /* In the APSW Connection object, the first entry after
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	126 * PyObject_HEAD is the sqlite3* we want to get hold of.
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	127 * Luckily, this is the same layout as we have in our
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	128 * pysqlite_Connection */
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	129 self->db = ((pysqlite_Connection*)database)->db;
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	130
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	131 Py_INCREF(database);
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	132 self->apsw_connection = database;
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	133 is_apsw_connection = 1;
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	134 }
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	135 }
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	136 }
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	137 Py_XDECREF(class_attr_str);
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	138 Py_XDECREF(class_attr);
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	139
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	140 if (!is_apsw_connection) {
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	141 PyErr_SetString(PyExc_ValueError, "database parameter must be string or APSW Connection object");
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	142 return -1;
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	143 }
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	144 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	145
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	146 if (!isolation_level) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	147 isolation_level = PyString_FromString("");
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	148 if (!isolation_level) {
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	149 return -1;
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	150 }
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	151 } else {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	152 Py_INCREF(isolation_level);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	153 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	154 self->isolation_level = NULL;
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	155 pysqlite_connection_set_isolation_level(self, isolation_level);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	156 Py_DECREF(isolation_level);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	157
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	158 self->statement_cache = (pysqlite_Cache)PyObject_CallFunction((PyObject)&pysqlite_CacheType, "Oi", self, cached_statements);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	159 if (PyErr_Occurred()) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	160 return -1;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	161 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	162
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	163 self->created_statements = 0;
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	164 self->created_cursors = 0;
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	165
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	166 /* Create lists of weak references to statements/cursors */
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	167 self->statements = PyList_New(0);
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	168 self->cursors = PyList_New(0);
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	169 if (!self->statements \|\| !self->cursors) {
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	170 return -1;
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	171 }
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	172
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	173 /* By default, the Cache class INCREFs the factory in its initializer, and
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	174 * decrefs it in its deallocator method. Since this would create a circular
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	175 * reference here, we're breaking it by decrementing self, and telling the
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	176 * cache class to not decref the factory (self) in its deallocator.
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	177 */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	178 self->statement_cache->decref_factory = 0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	179 Py_DECREF(self);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	180
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	181 self->inTransaction = 0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	182 self->detect_types = detect_types;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	183 self->timeout = timeout;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	184 (void)sqlite3_busy_timeout(self->db, (int)(timeout*1000));
52868 2bbb60c00eb7 #5615: make it possible to configure --without-threads again. Georg Brandl <georg@python.org> parents: 51775 diff changeset	185 #ifdef WITH_THREAD
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	186 self->thread_ident = PyThread_get_thread_ident();
52868 2bbb60c00eb7 #5615: make it possible to configure --without-threads again. Georg Brandl <georg@python.org> parents: 51775 diff changeset	187 #endif
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	188 self->check_same_thread = check_same_thread;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	189
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	190 self->function_pinboard = PyDict_New();
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	191 if (!self->function_pinboard) {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	192 return -1;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	193 }
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	194
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	195 self->collations = PyDict_New();
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	196 if (!self->collations) {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	197 return -1;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	198 }
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	199
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	200 self->Warning = pysqlite_Warning;
b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	201 self->Error = pysqlite_Error;
b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	202 self->InterfaceError = pysqlite_InterfaceError;
b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	203 self->DatabaseError = pysqlite_DatabaseError;
b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	204 self->DataError = pysqlite_DataError;
b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	205 self->OperationalError = pysqlite_OperationalError;
b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	206 self->IntegrityError = pysqlite_IntegrityError;
b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	207 self->InternalError = pysqlite_InternalError;
b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	208 self->ProgrammingError = pysqlite_ProgrammingError;
b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	209 self->NotSupportedError = pysqlite_NotSupportedError;
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	210
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	211 return 0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	212 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	213
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	214 /* Empty the entire statement cache of this connection */
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	215 void pysqlite_flush_statement_cache(pysqlite_Connection* self)
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	216 {
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	217 pysqlite_Node* node;
b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	218 pysqlite_Statement* statement;
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	219
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	220 node = self->statement_cache->first;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	221
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	222 while (node) {
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	223 statement = (pysqlite_Statement*)(node->data);
b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	224 (void)pysqlite_statement_finalize(statement);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	225 node = node->next;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	226 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	227
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	228 Py_DECREF(self->statement_cache);
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	229 self->statement_cache = (pysqlite_Cache)PyObject_CallFunction((PyObject)&pysqlite_CacheType, "O", self);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	230 Py_DECREF(self);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	231 self->statement_cache->decref_factory = 0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	232 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	233
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	234 /* action in (ACTION_RESET, ACTION_FINALIZE) */
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	235 void pysqlite_do_all_statements(pysqlite_Connection* self, int action, int reset_cursors)
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	236 {
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	237 int i;
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	238 PyObject* weakref;
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	239 PyObject* statement;
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	240 pysqlite_Cursor* cursor;
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	241
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	242 for (i = 0; i < PyList_Size(self->statements); i++) {
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	243 weakref = PyList_GetItem(self->statements, i);
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	244 statement = PyWeakref_GetObject(weakref);
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	245 if (statement != Py_None) {
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	246 if (action == ACTION_RESET) {
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	247 (void)pysqlite_statement_reset((pysqlite_Statement*)statement);
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	248 } else {
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	249 (void)pysqlite_statement_finalize((pysqlite_Statement*)statement);
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	250 }
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	251 }
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	252 }
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	253
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	254 if (reset_cursors) {
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	255 for (i = 0; i < PyList_Size(self->cursors); i++) {
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	256 weakref = PyList_GetItem(self->cursors, i);
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	257 cursor = (pysqlite_Cursor*)PyWeakref_GetObject(weakref);
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	258 if ((PyObject*)cursor != Py_None) {
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	259 cursor->reset = 1;
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	260 }
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	261 }
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	262 }
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	263 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	264
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	265 void pysqlite_connection_dealloc(pysqlite_Connection* self)
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	266 {
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	267 PyObject* ret = NULL;
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	268
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	269 Py_XDECREF(self->statement_cache);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	270
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	271 /* Clean up if user has not called .close() explicitly. */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	272 if (self->db) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	273 Py_BEGIN_ALLOW_THREADS
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	274 sqlite3_close(self->db);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	275 Py_END_ALLOW_THREADS
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	276 } else if (self->apsw_connection) {
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	277 ret = PyObject_CallMethod(self->apsw_connection, "close", "");
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	278 Py_XDECREF(ret);
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	279 Py_XDECREF(self->apsw_connection);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	280 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	281
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	282 if (self->begin_statement) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	283 PyMem_Free(self->begin_statement);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	284 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	285 Py_XDECREF(self->isolation_level);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	286 Py_XDECREF(self->function_pinboard);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	287 Py_XDECREF(self->row_factory);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	288 Py_XDECREF(self->text_factory);
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	289 Py_XDECREF(self->collations);
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	290 Py_XDECREF(self->statements);
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	291 Py_XDECREF(self->cursors);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	292
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	293 self->ob_type->tp_free((PyObject*)self);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	294 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	295
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	296 /*
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	297 * Registers a cursor with the connection.
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	298 *
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	299 * 0 => error; 1 => ok
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	300 */
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	301 int pysqlite_connection_register_cursor(pysqlite_Connection* connection, PyObject* cursor)
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	302 {
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	303 PyObject* weakref;
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	304
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	305 weakref = PyWeakref_NewRef((PyObject*)cursor, NULL);
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	306 if (!weakref) {
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	307 goto error;
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	308 }
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	309
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	310 if (PyList_Append(connection->cursors, weakref) != 0) {
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	311 Py_CLEAR(weakref);
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	312 goto error;
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	313 }
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	314
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	315 Py_DECREF(weakref);
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	316
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	317 return 1;
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	318 error:
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	319 return 0;
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	320 }
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	321
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	322 PyObject* pysqlite_connection_cursor(pysqlite_Connection* self, PyObject* args, PyObject* kwargs)
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	323 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	324 static char *kwlist[] = {"factory", NULL, NULL};
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	325 PyObject* factory = NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	326 PyObject* cursor;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	327
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	328 if (!PyArg_ParseTupleAndKeywords(args, kwargs, "\|O", kwlist,
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	329 &factory)) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	330 return NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	331 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	332
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	333 if (!pysqlite_check_thread(self) \|\| !pysqlite_check_connection(self)) {
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	334 return NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	335 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	336
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	337 if (factory == NULL) {
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	338 factory = (PyObject*)&pysqlite_CursorType;
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	339 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	340
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	341 cursor = PyObject_CallFunction(factory, "O", self);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	342
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	343 _pysqlite_drop_unused_cursor_references(self);
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	344
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	345 if (cursor && self->row_factory != Py_None) {
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	346 Py_XDECREF(((pysqlite_Cursor*)cursor)->row_factory);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	347 Py_INCREF(self->row_factory);
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	348 ((pysqlite_Cursor*)cursor)->row_factory = self->row_factory;
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	349 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	350
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	351 return cursor;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	352 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	353
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	354 PyObject* pysqlite_connection_close(pysqlite_Connection* self, PyObject* args)
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	355 {
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	356 PyObject* ret;
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	357 int rc;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	358
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	359 if (!pysqlite_check_thread(self)) {
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	360 return NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	361 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	362
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	363 pysqlite_do_all_statements(self, ACTION_FINALIZE, 1);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	364
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	365 if (self->db) {
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	366 if (self->apsw_connection) {
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	367 ret = PyObject_CallMethod(self->apsw_connection, "close", "");
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	368 Py_XDECREF(ret);
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	369 Py_XDECREF(self->apsw_connection);
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	370 self->apsw_connection = NULL;
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	371 self->db = NULL;
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	372 } else {
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	373 Py_BEGIN_ALLOW_THREADS
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	374 rc = sqlite3_close(self->db);
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	375 Py_END_ALLOW_THREADS
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	376
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	377 if (rc != SQLITE_OK) {
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	378 _pysqlite_seterror(self->db, NULL);
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	379 return NULL;
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	380 } else {
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	381 self->db = NULL;
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	382 }
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	383 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	384 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	385
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	386 Py_INCREF(Py_None);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	387 return Py_None;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	388 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	389
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	390 /*
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	391 * Checks if a connection object is usable (i. e. not closed).
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	392 *
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	393 * 0 => error; 1 => ok
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	394 */
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	395 int pysqlite_check_connection(pysqlite_Connection* con)
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	396 {
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	397 if (!con->initialized) {
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	398 PyErr_SetString(pysqlite_ProgrammingError, "Base Connection.__init__ not called.");
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	399 return 0;
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	400 }
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	401
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	402 if (!con->db) {
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	403 PyErr_SetString(pysqlite_ProgrammingError, "Cannot operate on a closed database.");
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	404 return 0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	405 } else {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	406 return 1;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	407 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	408 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	409
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	410 PyObject* _pysqlite_connection_begin(pysqlite_Connection* self)
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	411 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	412 int rc;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	413 const char* tail;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	414 sqlite3_stmt* statement;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	415
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	416 Py_BEGIN_ALLOW_THREADS
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	417 rc = sqlite3_prepare(self->db, self->begin_statement, -1, &statement, &tail);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	418 Py_END_ALLOW_THREADS
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	419
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	420 if (rc != SQLITE_OK) {
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	421 _pysqlite_seterror(self->db, statement);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	422 goto error;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	423 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	424
49154 4c77d1016f60 Fixes issue #3103. In the sqlite3 module, made one more function static. All renaming public symbos now have the pysqlite prefix to avoid name clashes. This at least once created problems where the same symbol name appeared somewhere in Apache and the sqlite3 module was used from mod_python. Gerhard Häring <gh@ghaering.de> parents: 49153 diff changeset	425 rc = pysqlite_step(statement, self);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	426 if (rc == SQLITE_DONE) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	427 self->inTransaction = 1;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	428 } else {
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	429 _pysqlite_seterror(self->db, statement);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	430 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	431
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	432 Py_BEGIN_ALLOW_THREADS
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	433 rc = sqlite3_finalize(statement);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	434 Py_END_ALLOW_THREADS
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	435
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	436 if (rc != SQLITE_OK && !PyErr_Occurred()) {
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	437 _pysqlite_seterror(self->db, NULL);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	438 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	439
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	440 error:
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	441 if (PyErr_Occurred()) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	442 return NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	443 } else {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	444 Py_INCREF(Py_None);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	445 return Py_None;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	446 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	447 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	448
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	449 PyObject* pysqlite_connection_commit(pysqlite_Connection* self, PyObject* args)
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	450 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	451 int rc;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	452 const char* tail;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	453 sqlite3_stmt* statement;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	454
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	455 if (!pysqlite_check_thread(self) \|\| !pysqlite_check_connection(self)) {
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	456 return NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	457 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	458
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	459 if (self->inTransaction) {
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	460 pysqlite_do_all_statements(self, ACTION_RESET, 0);
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	461
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	462 Py_BEGIN_ALLOW_THREADS
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	463 rc = sqlite3_prepare(self->db, "COMMIT", -1, &statement, &tail);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	464 Py_END_ALLOW_THREADS
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	465 if (rc != SQLITE_OK) {
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	466 _pysqlite_seterror(self->db, NULL);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	467 goto error;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	468 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	469
49154 4c77d1016f60 Fixes issue #3103. In the sqlite3 module, made one more function static. All renaming public symbos now have the pysqlite prefix to avoid name clashes. This at least once created problems where the same symbol name appeared somewhere in Apache and the sqlite3 module was used from mod_python. Gerhard Häring <gh@ghaering.de> parents: 49153 diff changeset	470 rc = pysqlite_step(statement, self);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	471 if (rc == SQLITE_DONE) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	472 self->inTransaction = 0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	473 } else {
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	474 _pysqlite_seterror(self->db, statement);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	475 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	476
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	477 Py_BEGIN_ALLOW_THREADS
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	478 rc = sqlite3_finalize(statement);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	479 Py_END_ALLOW_THREADS
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	480 if (rc != SQLITE_OK && !PyErr_Occurred()) {
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	481 _pysqlite_seterror(self->db, NULL);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	482 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	483
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	484 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	485
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	486 error:
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	487 if (PyErr_Occurred()) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	488 return NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	489 } else {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	490 Py_INCREF(Py_None);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	491 return Py_None;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	492 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	493 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	494
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	495 PyObject* pysqlite_connection_rollback(pysqlite_Connection* self, PyObject* args)
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	496 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	497 int rc;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	498 const char* tail;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	499 sqlite3_stmt* statement;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	500
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	501 if (!pysqlite_check_thread(self) \|\| !pysqlite_check_connection(self)) {
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	502 return NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	503 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	504
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	505 if (self->inTransaction) {
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	506 pysqlite_do_all_statements(self, ACTION_RESET, 1);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	507
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	508 Py_BEGIN_ALLOW_THREADS
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	509 rc = sqlite3_prepare(self->db, "ROLLBACK", -1, &statement, &tail);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	510 Py_END_ALLOW_THREADS
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	511 if (rc != SQLITE_OK) {
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	512 _pysqlite_seterror(self->db, NULL);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	513 goto error;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	514 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	515
49154 4c77d1016f60 Fixes issue #3103. In the sqlite3 module, made one more function static. All renaming public symbos now have the pysqlite prefix to avoid name clashes. This at least once created problems where the same symbol name appeared somewhere in Apache and the sqlite3 module was used from mod_python. Gerhard Häring <gh@ghaering.de> parents: 49153 diff changeset	516 rc = pysqlite_step(statement, self);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	517 if (rc == SQLITE_DONE) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	518 self->inTransaction = 0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	519 } else {
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	520 _pysqlite_seterror(self->db, statement);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	521 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	522
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	523 Py_BEGIN_ALLOW_THREADS
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	524 rc = sqlite3_finalize(statement);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	525 Py_END_ALLOW_THREADS
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	526 if (rc != SQLITE_OK && !PyErr_Occurred()) {
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	527 _pysqlite_seterror(self->db, NULL);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	528 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	529
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	530 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	531
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	532 error:
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	533 if (PyErr_Occurred()) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	534 return NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	535 } else {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	536 Py_INCREF(Py_None);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	537 return Py_None;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	538 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	539 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	540
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	541 void _pysqlite_set_result(sqlite3_context* context, PyObject* py_val)
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	542 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	543 long longval;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	544 const char* buffer;
37387 4ab8ec9e59df Make ssize_t clean Neal Norwitz <nnorwitz@gmail.com> parents: 37362 diff changeset	545 Py_ssize_t buflen;
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	546 PyObject* stringval;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	547
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	548 if ((!py_val) \|\| PyErr_Occurred()) {
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	549 sqlite3_result_null(context);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	550 } else if (py_val == Py_None) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	551 sqlite3_result_null(context);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	552 } else if (PyInt_Check(py_val)) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	553 longval = PyInt_AsLong(py_val);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	554 sqlite3_result_int64(context, (PY_LONG_LONG)longval);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	555 } else if (PyFloat_Check(py_val)) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	556 sqlite3_result_double(context, PyFloat_AsDouble(py_val));
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	557 } else if (PyBuffer_Check(py_val)) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	558 if (PyObject_AsCharBuffer(py_val, &buffer, &buflen) != 0) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	559 PyErr_SetString(PyExc_ValueError, "could not convert BLOB to buffer");
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	560 } else {
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	561 sqlite3_result_blob(context, buffer, buflen, SQLITE_TRANSIENT);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	562 }
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	563 } else if (PyString_Check(py_val)) {
52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	564 sqlite3_result_text(context, PyString_AsString(py_val), -1, SQLITE_TRANSIENT);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	565 } else if (PyUnicode_Check(py_val)) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	566 stringval = PyUnicode_AsUTF8String(py_val);
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	567 if (stringval) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	568 sqlite3_result_text(context, PyString_AsString(stringval), -1, SQLITE_TRANSIENT);
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	569 Py_DECREF(stringval);
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	570 }
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	571 } else {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	572 /* TODO: raise error */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	573 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	574 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	575
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	576 PyObject* _pysqlite_build_py_params(sqlite3_context context, int argc, sqlite3_value* argv)
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	577 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	578 PyObject* args;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	579 int i;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	580 sqlite3_value* cur_value;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	581 PyObject* cur_py_value;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	582 const char* val_str;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	583 PY_LONG_LONG val_int;
37387 4ab8ec9e59df Make ssize_t clean Neal Norwitz <nnorwitz@gmail.com> parents: 37362 diff changeset	584 Py_ssize_t buflen;
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	585 void* raw_buffer;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	586
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	587 args = PyTuple_New(argc);
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	588 if (!args) {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	589 return NULL;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	590 }
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	591
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	592 for (i = 0; i < argc; i++) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	593 cur_value = argv[i];
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	594 switch (sqlite3_value_type(argv[i])) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	595 case SQLITE_INTEGER:
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	596 val_int = sqlite3_value_int64(cur_value);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	597 cur_py_value = PyInt_FromLong((long)val_int);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	598 break;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	599 case SQLITE_FLOAT:
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	600 cur_py_value = PyFloat_FromDouble(sqlite3_value_double(cur_value));
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	601 break;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	602 case SQLITE_TEXT:
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	603 val_str = (const char*)sqlite3_value_text(cur_value);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	604 cur_py_value = PyUnicode_DecodeUTF8(val_str, strlen(val_str), NULL);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	605 /* TODO: have a way to show errors here */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	606 if (!cur_py_value) {
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	607 PyErr_Clear();
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	608 Py_INCREF(Py_None);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	609 cur_py_value = Py_None;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	610 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	611 break;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	612 case SQLITE_BLOB:
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	613 buflen = sqlite3_value_bytes(cur_value);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	614 cur_py_value = PyBuffer_New(buflen);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	615 if (!cur_py_value) {
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	616 break;
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	617 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	618 if (PyObject_AsWriteBuffer(cur_py_value, &raw_buffer, &buflen)) {
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	619 Py_DECREF(cur_py_value);
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	620 cur_py_value = NULL;
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	621 break;
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	622 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	623 memcpy(raw_buffer, sqlite3_value_blob(cur_value), buflen);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	624 break;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	625 case SQLITE_NULL:
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	626 default:
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	627 Py_INCREF(Py_None);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	628 cur_py_value = Py_None;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	629 }
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	630
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	631 if (!cur_py_value) {
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	632 Py_DECREF(args);
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	633 return NULL;
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	634 }
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	635
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	636 PyTuple_SetItem(args, i, cur_py_value);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	637
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	638 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	639
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	640 return args;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	641 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	642
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	643 void _pysqlite_func_callback(sqlite3_context* context, int argc, sqlite3_value** argv)
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	644 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	645 PyObject* args;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	646 PyObject* py_func;
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	647 PyObject* py_retval = NULL;
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	648
52868 2bbb60c00eb7 #5615: make it possible to configure --without-threads again. Georg Brandl <georg@python.org> parents: 51775 diff changeset	649 #ifdef WITH_THREAD
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	650 PyGILState_STATE threadstate;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	651
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	652 threadstate = PyGILState_Ensure();
52868 2bbb60c00eb7 #5615: make it possible to configure --without-threads again. Georg Brandl <georg@python.org> parents: 51775 diff changeset	653 #endif
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	654
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	655 py_func = (PyObject*)sqlite3_user_data(context);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	656
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	657 args = _pysqlite_build_py_params(context, argc, argv);
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	658 if (args) {
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	659 py_retval = PyObject_CallObject(py_func, args);
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	660 Py_DECREF(args);
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	661 }
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	662
38808 3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	663 if (py_retval) {
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	664 _pysqlite_set_result(context, py_retval);
38808 3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	665 Py_DECREF(py_retval);
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	666 } else {
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	667 if (_enable_callback_tracebacks) {
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	668 PyErr_Print();
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	669 } else {
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	670 PyErr_Clear();
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	671 }
38833 d7bc6470e838 - Added version checks in C code to make sure we don't trigger bugs in older Gerhard Häring <gh@ghaering.de> parents: 38808 diff changeset	672 _sqlite3_result_error(context, "user-defined function raised exception", -1);
38808 3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	673 }
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	674
52868 2bbb60c00eb7 #5615: make it possible to configure --without-threads again. Georg Brandl <georg@python.org> parents: 51775 diff changeset	675 #ifdef WITH_THREAD
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	676 PyGILState_Release(threadstate);
52868 2bbb60c00eb7 #5615: make it possible to configure --without-threads again. Georg Brandl <georg@python.org> parents: 51775 diff changeset	677 #endif
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	678 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	679
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	680 static void _pysqlite_step_callback(sqlite3_context context, int argc, sqlite3_value* params)
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	681 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	682 PyObject* args;
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	683 PyObject* function_result = NULL;
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	684 PyObject* aggregate_class;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	685 PyObject** aggregate_instance;
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	686 PyObject* stepmethod = NULL;
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	687
52868 2bbb60c00eb7 #5615: make it possible to configure --without-threads again. Georg Brandl <georg@python.org> parents: 51775 diff changeset	688 #ifdef WITH_THREAD
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	689 PyGILState_STATE threadstate;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	690
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	691 threadstate = PyGILState_Ensure();
52868 2bbb60c00eb7 #5615: make it possible to configure --without-threads again. Georg Brandl <georg@python.org> parents: 51775 diff changeset	692 #endif
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	693
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	694 aggregate_class = (PyObject*)sqlite3_user_data(context);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	695
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	696 aggregate_instance = (PyObject*)sqlite3_aggregate_context(context, sizeof(PyObject));
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	697
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	698 if (*aggregate_instance == 0) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	699 *aggregate_instance = PyObject_CallFunction(aggregate_class, "");
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	700
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	701 if (PyErr_Occurred()) {
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	702 *aggregate_instance = 0;
38808 3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	703 if (_enable_callback_tracebacks) {
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	704 PyErr_Print();
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	705 } else {
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	706 PyErr_Clear();
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	707 }
38833 d7bc6470e838 - Added version checks in C code to make sure we don't trigger bugs in older Gerhard Häring <gh@ghaering.de> parents: 38808 diff changeset	708 _sqlite3_result_error(context, "user-defined aggregate's '__init__' method raised error", -1);
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	709 goto error;
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	710 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	711 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	712
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	713 stepmethod = PyObject_GetAttrString(*aggregate_instance, "step");
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	714 if (!stepmethod) {
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	715 goto error;
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	716 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	717
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	718 args = _pysqlite_build_py_params(context, argc, params);
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	719 if (!args) {
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	720 goto error;
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	721 }
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	722
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	723 function_result = PyObject_CallObject(stepmethod, args);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	724 Py_DECREF(args);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	725
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	726 if (!function_result) {
38808 3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	727 if (_enable_callback_tracebacks) {
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	728 PyErr_Print();
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	729 } else {
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	730 PyErr_Clear();
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	731 }
38833 d7bc6470e838 - Added version checks in C code to make sure we don't trigger bugs in older Gerhard Häring <gh@ghaering.de> parents: 38808 diff changeset	732 _sqlite3_result_error(context, "user-defined aggregate's 'step' method raised error", -1);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	733 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	734
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	735 error:
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	736 Py_XDECREF(stepmethod);
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	737 Py_XDECREF(function_result);
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	738
52868 2bbb60c00eb7 #5615: make it possible to configure --without-threads again. Georg Brandl <georg@python.org> parents: 51775 diff changeset	739 #ifdef WITH_THREAD
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	740 PyGILState_Release(threadstate);
52868 2bbb60c00eb7 #5615: make it possible to configure --without-threads again. Georg Brandl <georg@python.org> parents: 51775 diff changeset	741 #endif
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	742 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	743
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	744 void _pysqlite_final_callback(sqlite3_context* context)
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	745 {
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	746 PyObject* function_result = NULL;
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	747 PyObject** aggregate_instance;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	748
52868 2bbb60c00eb7 #5615: make it possible to configure --without-threads again. Georg Brandl <georg@python.org> parents: 51775 diff changeset	749 #ifdef WITH_THREAD
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	750 PyGILState_STATE threadstate;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	751
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	752 threadstate = PyGILState_Ensure();
52868 2bbb60c00eb7 #5615: make it possible to configure --without-threads again. Georg Brandl <georg@python.org> parents: 51775 diff changeset	753 #endif
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	754
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	755 aggregate_instance = (PyObject*)sqlite3_aggregate_context(context, sizeof(PyObject));
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	756 if (!*aggregate_instance) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	757 /* this branch is executed if there was an exception in the aggregate's
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	758 * __init__ */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	759
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	760 goto error;
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	761 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	762
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	763 function_result = PyObject_CallMethod(*aggregate_instance, "finalize", "");
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	764 if (!function_result) {
38808 3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	765 if (_enable_callback_tracebacks) {
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	766 PyErr_Print();
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	767 } else {
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	768 PyErr_Clear();
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	769 }
38833 d7bc6470e838 - Added version checks in C code to make sure we don't trigger bugs in older Gerhard Häring <gh@ghaering.de> parents: 38808 diff changeset	770 _sqlite3_result_error(context, "user-defined aggregate's 'finalize' method raised error", -1);
38808 3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	771 } else {
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	772 _pysqlite_set_result(context, function_result);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	773 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	774
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	775 error:
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	776 Py_XDECREF(*aggregate_instance);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	777 Py_XDECREF(function_result);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	778
52868 2bbb60c00eb7 #5615: make it possible to configure --without-threads again. Georg Brandl <georg@python.org> parents: 51775 diff changeset	779 #ifdef WITH_THREAD
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	780 PyGILState_Release(threadstate);
52868 2bbb60c00eb7 #5615: make it possible to configure --without-threads again. Georg Brandl <georg@python.org> parents: 51775 diff changeset	781 #endif
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	782 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	783
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	784 static void _pysqlite_drop_unused_statement_references(pysqlite_Connection* self)
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	785 {
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	786 PyObject* new_list;
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	787 PyObject* weakref;
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	788 int i;
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	789
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	790 /* we only need to do this once in a while */
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	791 if (self->created_statements++ < 200) {
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	792 return;
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	793 }
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	794
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	795 self->created_statements = 0;
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	796
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	797 new_list = PyList_New(0);
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	798 if (!new_list) {
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	799 return;
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	800 }
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	801
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	802 for (i = 0; i < PyList_Size(self->statements); i++) {
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	803 weakref = PyList_GetItem(self->statements, i);
38883 408d2a596f99 Fixed a memory leak that was introduced with incorrect usage of the Python weak Gerhard Häring <gh@ghaering.de> parents: 38835 diff changeset	804 if (PyWeakref_GetObject(weakref) != Py_None) {
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	805 if (PyList_Append(new_list, weakref) != 0) {
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	806 Py_DECREF(new_list);
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	807 return;
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	808 }
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	809 }
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	810 }
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	811
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	812 Py_DECREF(self->statements);
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	813 self->statements = new_list;
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	814 }
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	815
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	816 static void _pysqlite_drop_unused_cursor_references(pysqlite_Connection* self)
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	817 {
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	818 PyObject* new_list;
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	819 PyObject* weakref;
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	820 int i;
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	821
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	822 /* we only need to do this once in a while */
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	823 if (self->created_cursors++ < 200) {
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	824 return;
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	825 }
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	826
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	827 self->created_cursors = 0;
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	828
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	829 new_list = PyList_New(0);
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	830 if (!new_list) {
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	831 return;
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	832 }
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	833
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	834 for (i = 0; i < PyList_Size(self->cursors); i++) {
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	835 weakref = PyList_GetItem(self->cursors, i);
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	836 if (PyWeakref_GetObject(weakref) != Py_None) {
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	837 if (PyList_Append(new_list, weakref) != 0) {
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	838 Py_DECREF(new_list);
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	839 return;
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	840 }
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	841 }
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	842 }
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	843
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	844 Py_DECREF(self->cursors);
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	845 self->cursors = new_list;
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	846 }
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	847
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	848 PyObject* pysqlite_connection_create_function(pysqlite_Connection* self, PyObject* args, PyObject* kwargs)
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	849 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	850 static char *kwlist[] = {"name", "narg", "func", NULL, NULL};
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	851
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	852 PyObject* func;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	853 char* name;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	854 int narg;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	855 int rc;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	856
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	857 if (!pysqlite_check_thread(self) \|\| !pysqlite_check_connection(self)) {
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	858 return NULL;
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	859 }
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	860
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	861 if (!PyArg_ParseTupleAndKeywords(args, kwargs, "siO", kwlist,
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	862 &name, &narg, &func))
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	863 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	864 return NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	865 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	866
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	867 rc = sqlite3_create_function(self->db, name, narg, SQLITE_UTF8, (void*)func, _pysqlite_func_callback, NULL, NULL);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	868
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	869 if (rc != SQLITE_OK) {
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	870 /* Workaround for SQLite bug: no error code or string is available here */
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	871 PyErr_SetString(pysqlite_OperationalError, "Error creating function");
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	872 return NULL;
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	873 } else {
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	874 if (PyDict_SetItem(self->function_pinboard, func, Py_None) == -1)
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	875 return NULL;
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	876
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	877 Py_INCREF(Py_None);
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	878 return Py_None;
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	879 }
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	880 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	881
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	882 PyObject* pysqlite_connection_create_aggregate(pysqlite_Connection* self, PyObject* args, PyObject* kwargs)
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	883 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	884 PyObject* aggregate_class;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	885
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	886 int n_arg;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	887 char* name;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	888 static char *kwlist[] = { "name", "n_arg", "aggregate_class", NULL };
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	889 int rc;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	890
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	891 if (!pysqlite_check_thread(self) \|\| !pysqlite_check_connection(self)) {
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	892 return NULL;
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	893 }
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	894
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	895 if (!PyArg_ParseTupleAndKeywords(args, kwargs, "siO:create_aggregate",
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	896 kwlist, &name, &n_arg, &aggregate_class)) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	897 return NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	898 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	899
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	900 rc = sqlite3_create_function(self->db, name, n_arg, SQLITE_UTF8, (void*)aggregate_class, 0, &_pysqlite_step_callback, &_pysqlite_final_callback);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	901 if (rc != SQLITE_OK) {
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	902 /* Workaround for SQLite bug: no error code or string is available here */
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	903 PyErr_SetString(pysqlite_OperationalError, "Error creating aggregate");
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	904 return NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	905 } else {
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	906 if (PyDict_SetItem(self->function_pinboard, aggregate_class, Py_None) == -1)
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	907 return NULL;
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	908
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	909 Py_INCREF(Py_None);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	910 return Py_None;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	911 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	912 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	913
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	914 static int _authorizer_callback(void* user_arg, int action, const char* arg1, const char* arg2 , const char* dbname, const char* access_attempt_source)
38808 3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	915 {
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	916 PyObject *ret;
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	917 int rc;
52868 2bbb60c00eb7 #5615: make it possible to configure --without-threads again. Georg Brandl <georg@python.org> parents: 51775 diff changeset	918 #ifdef WITH_THREAD
38808 3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	919 PyGILState_STATE gilstate;
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	920
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	921 gilstate = PyGILState_Ensure();
52868 2bbb60c00eb7 #5615: make it possible to configure --without-threads again. Georg Brandl <georg@python.org> parents: 51775 diff changeset	922 #endif
38808 3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	923 ret = PyObject_CallFunction((PyObject*)user_arg, "issss", action, arg1, arg2, dbname, access_attempt_source);
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	924
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	925 if (!ret) {
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	926 if (_enable_callback_tracebacks) {
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	927 PyErr_Print();
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	928 } else {
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	929 PyErr_Clear();
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	930 }
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	931
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	932 rc = SQLITE_DENY;
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	933 } else {
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	934 if (PyInt_Check(ret)) {
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	935 rc = (int)PyInt_AsLong(ret);
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	936 } else {
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	937 rc = SQLITE_DENY;
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	938 }
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	939 Py_DECREF(ret);
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	940 }
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	941
52868 2bbb60c00eb7 #5615: make it possible to configure --without-threads again. Georg Brandl <georg@python.org> parents: 51775 diff changeset	942 #ifdef WITH_THREAD
38808 3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	943 PyGILState_Release(gilstate);
52868 2bbb60c00eb7 #5615: make it possible to configure --without-threads again. Georg Brandl <georg@python.org> parents: 51775 diff changeset	944 #endif
38808 3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	945 return rc;
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	946 }
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	947
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	948 static int _progress_handler(void* user_arg)
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	949 {
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	950 int rc;
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	951 PyObject *ret;
52868 2bbb60c00eb7 #5615: make it possible to configure --without-threads again. Georg Brandl <georg@python.org> parents: 51775 diff changeset	952 #ifdef WITH_THREAD
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	953 PyGILState_STATE gilstate;
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	954
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	955 gilstate = PyGILState_Ensure();
52868 2bbb60c00eb7 #5615: make it possible to configure --without-threads again. Georg Brandl <georg@python.org> parents: 51775 diff changeset	956 #endif
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	957 ret = PyObject_CallFunction((PyObject*)user_arg, "");
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	958
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	959 if (!ret) {
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	960 if (_enable_callback_tracebacks) {
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	961 PyErr_Print();
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	962 } else {
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	963 PyErr_Clear();
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	964 }
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	965
51775 af9b6c43804e Issue #5341: Fix a variety of spelling errors. Mark Dickinson <dickinsm@gmail.com> parents: 49154 diff changeset	966 /* abort query if error occurred */
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	967 rc = 1;
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	968 } else {
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	969 rc = (int)PyObject_IsTrue(ret);
45632 a18a424c2bd3 Only DECREF if ret != NULL Neal Norwitz <nnorwitz@gmail.com> parents: 45580 diff changeset	970 Py_DECREF(ret);
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	971 }
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	972
52868 2bbb60c00eb7 #5615: make it possible to configure --without-threads again. Georg Brandl <georg@python.org> parents: 51775 diff changeset	973 #ifdef WITH_THREAD
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	974 PyGILState_Release(gilstate);
52868 2bbb60c00eb7 #5615: make it possible to configure --without-threads again. Georg Brandl <georg@python.org> parents: 51775 diff changeset	975 #endif
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	976 return rc;
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	977 }
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	978
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	979 static PyObject* pysqlite_connection_set_authorizer(pysqlite_Connection* self, PyObject* args, PyObject* kwargs)
38808 3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	980 {
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	981 PyObject* authorizer_cb;
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	982
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	983 static char *kwlist[] = { "authorizer_callback", NULL };
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	984 int rc;
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	985
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	986 if (!pysqlite_check_thread(self) \|\| !pysqlite_check_connection(self)) {
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	987 return NULL;
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	988 }
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	989
38808 3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	990 if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O:set_authorizer",
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	991 kwlist, &authorizer_cb)) {
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	992 return NULL;
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	993 }
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	994
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	995 rc = sqlite3_set_authorizer(self->db, _authorizer_callback, (void*)authorizer_cb);
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	996
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	997 if (rc != SQLITE_OK) {
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	998 PyErr_SetString(pysqlite_OperationalError, "Error setting authorizer callback");
38808 3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	999 return NULL;
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	1000 } else {
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1001 if (PyDict_SetItem(self->function_pinboard, authorizer_cb, Py_None) == -1)
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1002 return NULL;
38808 3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	1003
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	1004 Py_INCREF(Py_None);
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	1005 return Py_None;
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	1006 }
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	1007 }
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	1008
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1009 static PyObject* pysqlite_connection_set_progress_handler(pysqlite_Connection* self, PyObject* args, PyObject* kwargs)
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1010 {
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1011 PyObject* progress_handler;
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1012 int n;
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1013
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1014 static char *kwlist[] = { "progress_handler", "n", NULL };
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1015
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1016 if (!pysqlite_check_thread(self) \|\| !pysqlite_check_connection(self)) {
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1017 return NULL;
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1018 }
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1019
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1020 if (!PyArg_ParseTupleAndKeywords(args, kwargs, "Oi:set_progress_handler",
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1021 kwlist, &progress_handler, &n)) {
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1022 return NULL;
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1023 }
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1024
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1025 if (progress_handler == Py_None) {
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1026 /* None clears the progress handler previously set */
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1027 sqlite3_progress_handler(self->db, 0, 0, (void*)0);
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1028 } else {
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1029 sqlite3_progress_handler(self->db, n, _progress_handler, progress_handler);
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1030 if (PyDict_SetItem(self->function_pinboard, progress_handler, Py_None) == -1)
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1031 return NULL;
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1032 }
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1033
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1034 Py_INCREF(Py_None);
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1035 return Py_None;
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1036 }
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1037
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1038 #ifdef HAVE_LOAD_EXTENSION
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1039 static PyObject* pysqlite_enable_load_extension(pysqlite_Connection* self, PyObject* args)
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1040 {
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1041 int rc;
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1042 int onoff;
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1043
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1044 if (!pysqlite_check_thread(self) \|\| !pysqlite_check_connection(self)) {
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1045 return NULL;
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1046 }
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1047
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1048 if (!PyArg_ParseTuple(args, "i", &onoff)) {
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1049 return NULL;
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1050 }
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1051
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1052 rc = sqlite3_enable_load_extension(self->db, onoff);
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1053
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1054 if (rc != SQLITE_OK) {
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1055 PyErr_SetString(pysqlite_OperationalError, "Error enabling load extension");
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1056 return NULL;
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1057 } else {
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1058 Py_INCREF(Py_None);
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1059 return Py_None;
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1060 }
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1061 }
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1062
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1063 static PyObject* pysqlite_load_extension(pysqlite_Connection* self, PyObject* args)
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1064 {
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1065 int rc;
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1066 char* extension_name;
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1067 char* errmsg;
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1068
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1069 if (!pysqlite_check_thread(self) \|\| !pysqlite_check_connection(self)) {
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1070 return NULL;
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1071 }
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1072
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1073 if (!PyArg_ParseTuple(args, "s", &extension_name)) {
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1074 return NULL;
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1075 }
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1076
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1077 rc = sqlite3_load_extension(self->db, extension_name, 0, &errmsg);
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1078 if (rc != 0) {
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1079 PyErr_SetString(pysqlite_OperationalError, errmsg);
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1080 return NULL;
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1081 } else {
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1082 Py_INCREF(Py_None);
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1083 return Py_None;
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1084 }
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1085 }
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1086 #endif
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1087
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1088 int pysqlite_check_thread(pysqlite_Connection* self)
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1089 {
52868 2bbb60c00eb7 #5615: make it possible to configure --without-threads again. Georg Brandl <georg@python.org> parents: 51775 diff changeset	1090 #ifdef WITH_THREAD
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1091 if (self->check_same_thread) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1092 if (PyThread_get_thread_ident() != self->thread_ident) {
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1093 PyErr_Format(pysqlite_ProgrammingError,
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1094 "SQLite objects created in a thread can only be used in that same thread."
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1095 "The object was created in thread id %ld and this is thread id %ld",
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1096 self->thread_ident, PyThread_get_thread_ident());
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1097 return 0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1098 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1099
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1100 }
52868 2bbb60c00eb7 #5615: make it possible to configure --without-threads again. Georg Brandl <georg@python.org> parents: 51775 diff changeset	1101 #endif
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1102 return 1;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1103 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1104
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1105 static PyObject* pysqlite_connection_get_isolation_level(pysqlite_Connection* self, void* unused)
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1106 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1107 Py_INCREF(self->isolation_level);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1108 return self->isolation_level;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1109 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1110
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1111 static PyObject* pysqlite_connection_get_total_changes(pysqlite_Connection* self, void* unused)
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1112 {
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1113 if (!pysqlite_check_connection(self)) {
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1114 return NULL;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1115 } else {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1116 return Py_BuildValue("i", sqlite3_total_changes(self->db));
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1117 }
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1118 }
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1119
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1120 static int pysqlite_connection_set_isolation_level(pysqlite_Connection* self, PyObject* isolation_level)
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1121 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1122 PyObject* res;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1123 PyObject* begin_statement;
47991 091df4c08d99 #3312: fix two sqlite3 crashes. Georg Brandl <georg@python.org> parents: 47951 diff changeset	1124 char* begin_statement_str;
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1125
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1126 Py_XDECREF(self->isolation_level);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1127
37763 b7a3972e9915 Fix memory leak Neal Norwitz <nnorwitz@gmail.com> parents: 37517 diff changeset	1128 if (self->begin_statement) {
b7a3972e9915 Fix memory leak Neal Norwitz <nnorwitz@gmail.com> parents: 37517 diff changeset	1129 PyMem_Free(self->begin_statement);
b7a3972e9915 Fix memory leak Neal Norwitz <nnorwitz@gmail.com> parents: 37517 diff changeset	1130 self->begin_statement = NULL;
b7a3972e9915 Fix memory leak Neal Norwitz <nnorwitz@gmail.com> parents: 37517 diff changeset	1131 }
b7a3972e9915 Fix memory leak Neal Norwitz <nnorwitz@gmail.com> parents: 37517 diff changeset	1132
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1133 if (isolation_level == Py_None) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1134 Py_INCREF(Py_None);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1135 self->isolation_level = Py_None;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1136
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1137 res = pysqlite_connection_commit(self, NULL);
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1138 if (!res) {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1139 return -1;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1140 }
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1141 Py_DECREF(res);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1142
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1143 self->inTransaction = 0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1144 } else {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1145 Py_INCREF(isolation_level);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1146 self->isolation_level = isolation_level;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1147
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	1148 begin_statement = PyString_FromString("BEGIN ");
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1149 if (!begin_statement) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1150 return -1;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1151 }
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	1152 PyString_Concat(&begin_statement, isolation_level);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1153 if (!begin_statement) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1154 return -1;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1155 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1156
47991 091df4c08d99 #3312: fix two sqlite3 crashes. Georg Brandl <georg@python.org> parents: 47951 diff changeset	1157 begin_statement_str = PyString_AsString(begin_statement);
091df4c08d99 #3312: fix two sqlite3 crashes. Georg Brandl <georg@python.org> parents: 47951 diff changeset	1158 if (!begin_statement_str) {
091df4c08d99 #3312: fix two sqlite3 crashes. Georg Brandl <georg@python.org> parents: 47951 diff changeset	1159 Py_DECREF(begin_statement);
091df4c08d99 #3312: fix two sqlite3 crashes. Georg Brandl <georg@python.org> parents: 47951 diff changeset	1160 return -1;
091df4c08d99 #3312: fix two sqlite3 crashes. Georg Brandl <georg@python.org> parents: 47951 diff changeset	1161 }
091df4c08d99 #3312: fix two sqlite3 crashes. Georg Brandl <georg@python.org> parents: 47951 diff changeset	1162 self->begin_statement = PyMem_Malloc(strlen(begin_statement_str) + 2);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1163 if (!self->begin_statement) {
47991 091df4c08d99 #3312: fix two sqlite3 crashes. Georg Brandl <georg@python.org> parents: 47951 diff changeset	1164 Py_DECREF(begin_statement);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1165 return -1;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1166 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1167
47991 091df4c08d99 #3312: fix two sqlite3 crashes. Georg Brandl <georg@python.org> parents: 47951 diff changeset	1168 strcpy(self->begin_statement, begin_statement_str);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1169 Py_DECREF(begin_statement);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1170 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1171
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1172 return 0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1173 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1174
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1175 PyObject* pysqlite_connection_call(pysqlite_Connection* self, PyObject* args, PyObject* kwargs)
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1176 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1177 PyObject* sql;
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1178 pysqlite_Statement* statement;
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	1179 PyObject* weakref;
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1180 int rc;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1181
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1182 if (!pysqlite_check_thread(self) \|\| !pysqlite_check_connection(self)) {
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1183 return NULL;
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1184 }
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1185
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1186 if (!PyArg_ParseTuple(args, "O", &sql)) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1187 return NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1188 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1189
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1190 _pysqlite_drop_unused_statement_references(self);
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	1191
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1192 statement = PyObject_New(pysqlite_Statement, &pysqlite_StatementType);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1193 if (!statement) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1194 return NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1195 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1196
59559 1ee2452ce942 sqlite3: Fix a segfault on calling a connection with something else than a Victor Stinner <victor.stinner@haypocalc.com> parents: 59362 diff changeset	1197 statement->db = NULL;
1ee2452ce942 sqlite3: Fix a segfault on calling a connection with something else than a Victor Stinner <victor.stinner@haypocalc.com> parents: 59362 diff changeset	1198 statement->st = NULL;
1ee2452ce942 sqlite3: Fix a segfault on calling a connection with something else than a Victor Stinner <victor.stinner@haypocalc.com> parents: 59362 diff changeset	1199 statement->sql = NULL;
1ee2452ce942 sqlite3: Fix a segfault on calling a connection with something else than a Victor Stinner <victor.stinner@haypocalc.com> parents: 59362 diff changeset	1200 statement->in_use = 0;
1ee2452ce942 sqlite3: Fix a segfault on calling a connection with something else than a Victor Stinner <victor.stinner@haypocalc.com> parents: 59362 diff changeset	1201 statement->in_weakreflist = NULL;
1ee2452ce942 sqlite3: Fix a segfault on calling a connection with something else than a Victor Stinner <victor.stinner@haypocalc.com> parents: 59362 diff changeset	1202
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1203 rc = pysqlite_statement_create(statement, self, sql);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1204
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1205 if (rc != SQLITE_OK) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1206 if (rc == PYSQLITE_TOO_MUCH_SQL) {
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1207 PyErr_SetString(pysqlite_Warning, "You can only execute one statement at a time.");
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1208 } else if (rc == PYSQLITE_SQL_WRONG_TYPE) {
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1209 PyErr_SetString(pysqlite_Warning, "SQL is of wrong type. Must be string or unicode.");
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1210 } else {
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1211 (void)pysqlite_statement_reset(statement);
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1212 _pysqlite_seterror(self->db, NULL);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1213 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1214
47951 afe8d515bfe2 Issue #3153: sqlite leaks on error. Alexandre Vassalotti <alexandre@peadrop.com> parents: 47527 diff changeset	1215 Py_CLEAR(statement);
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	1216 } else {
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	1217 weakref = PyWeakref_NewRef((PyObject*)statement, NULL);
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	1218 if (!weakref) {
47951 afe8d515bfe2 Issue #3153: sqlite leaks on error. Alexandre Vassalotti <alexandre@peadrop.com> parents: 47527 diff changeset	1219 Py_CLEAR(statement);
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	1220 goto error;
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	1221 }
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	1222
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	1223 if (PyList_Append(self->statements, weakref) != 0) {
47951 afe8d515bfe2 Issue #3153: sqlite leaks on error. Alexandre Vassalotti <alexandre@peadrop.com> parents: 47527 diff changeset	1224 Py_CLEAR(weakref);
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	1225 goto error;
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	1226 }
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	1227
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	1228 Py_DECREF(weakref);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1229 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1230
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	1231 error:
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1232 return (PyObject*)statement;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1233 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1234
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1235 PyObject* pysqlite_connection_execute(pysqlite_Connection* self, PyObject* args, PyObject* kwargs)
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1236 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1237 PyObject* cursor = 0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1238 PyObject* result = 0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1239 PyObject* method = 0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1240
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1241 cursor = PyObject_CallMethod((PyObject*)self, "cursor", "");
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1242 if (!cursor) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1243 goto error;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1244 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1245
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1246 method = PyObject_GetAttrString(cursor, "execute");
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1247 if (!method) {
47951 afe8d515bfe2 Issue #3153: sqlite leaks on error. Alexandre Vassalotti <alexandre@peadrop.com> parents: 47527 diff changeset	1248 Py_CLEAR(cursor);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1249 goto error;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1250 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1251
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1252 result = PyObject_CallObject(method, args);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1253 if (!result) {
47951 afe8d515bfe2 Issue #3153: sqlite leaks on error. Alexandre Vassalotti <alexandre@peadrop.com> parents: 47527 diff changeset	1254 Py_CLEAR(cursor);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1255 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1256
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1257 error:
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1258 Py_XDECREF(result);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1259 Py_XDECREF(method);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1260
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1261 return cursor;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1262 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1263
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1264 PyObject* pysqlite_connection_executemany(pysqlite_Connection* self, PyObject* args, PyObject* kwargs)
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1265 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1266 PyObject* cursor = 0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1267 PyObject* result = 0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1268 PyObject* method = 0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1269
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1270 cursor = PyObject_CallMethod((PyObject*)self, "cursor", "");
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1271 if (!cursor) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1272 goto error;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1273 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1274
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1275 method = PyObject_GetAttrString(cursor, "executemany");
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1276 if (!method) {
47951 afe8d515bfe2 Issue #3153: sqlite leaks on error. Alexandre Vassalotti <alexandre@peadrop.com> parents: 47527 diff changeset	1277 Py_CLEAR(cursor);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1278 goto error;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1279 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1280
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1281 result = PyObject_CallObject(method, args);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1282 if (!result) {
47951 afe8d515bfe2 Issue #3153: sqlite leaks on error. Alexandre Vassalotti <alexandre@peadrop.com> parents: 47527 diff changeset	1283 Py_CLEAR(cursor);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1284 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1285
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1286 error:
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1287 Py_XDECREF(result);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1288 Py_XDECREF(method);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1289
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1290 return cursor;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1291 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1292
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1293 PyObject* pysqlite_connection_executescript(pysqlite_Connection* self, PyObject* args, PyObject* kwargs)
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1294 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1295 PyObject* cursor = 0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1296 PyObject* result = 0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1297 PyObject* method = 0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1298
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1299 cursor = PyObject_CallMethod((PyObject*)self, "cursor", "");
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1300 if (!cursor) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1301 goto error;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1302 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1303
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1304 method = PyObject_GetAttrString(cursor, "executescript");
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1305 if (!method) {
47951 afe8d515bfe2 Issue #3153: sqlite leaks on error. Alexandre Vassalotti <alexandre@peadrop.com> parents: 47527 diff changeset	1306 Py_CLEAR(cursor);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1307 goto error;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1308 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1309
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1310 result = PyObject_CallObject(method, args);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1311 if (!result) {
47951 afe8d515bfe2 Issue #3153: sqlite leaks on error. Alexandre Vassalotti <alexandre@peadrop.com> parents: 47527 diff changeset	1312 Py_CLEAR(cursor);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1313 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1314
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1315 error:
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1316 Py_XDECREF(result);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1317 Py_XDECREF(method);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1318
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1319 return cursor;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1320 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1321
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1322 /* ------------------------- COLLATION CODE ------------------------ */
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1323
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1324 static int
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1325 pysqlite_collation_callback(
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1326 void* context,
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1327 int text1_length, const void* text1_data,
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1328 int text2_length, const void* text2_data)
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1329 {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1330 PyObject* callback = (PyObject*)context;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1331 PyObject* string1 = 0;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1332 PyObject* string2 = 0;
52868 2bbb60c00eb7 #5615: make it possible to configure --without-threads again. Georg Brandl <georg@python.org> parents: 51775 diff changeset	1333 #ifdef WITH_THREAD
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1334 PyGILState_STATE gilstate;
52868 2bbb60c00eb7 #5615: make it possible to configure --without-threads again. Georg Brandl <georg@python.org> parents: 51775 diff changeset	1335 #endif
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1336 PyObject* retval = NULL;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1337 int result = 0;
52868 2bbb60c00eb7 #5615: make it possible to configure --without-threads again. Georg Brandl <georg@python.org> parents: 51775 diff changeset	1338 #ifdef WITH_THREAD
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1339 gilstate = PyGILState_Ensure();
52868 2bbb60c00eb7 #5615: make it possible to configure --without-threads again. Georg Brandl <georg@python.org> parents: 51775 diff changeset	1340 #endif
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1341
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1342 if (PyErr_Occurred()) {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1343 goto finally;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1344 }
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1345
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	1346 string1 = PyString_FromStringAndSize((const char*)text1_data, text1_length);
52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	1347 string2 = PyString_FromStringAndSize((const char*)text2_data, text2_length);
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1348
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1349 if (!string1 \|\| !string2) {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1350 goto finally; /* failed to allocate strings */
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1351 }
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1352
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1353 retval = PyObject_CallFunctionObjArgs(callback, string1, string2, NULL);
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1354
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1355 if (!retval) {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1356 /* execution failed */
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1357 goto finally;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1358 }
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1359
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1360 result = PyInt_AsLong(retval);
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1361 if (PyErr_Occurred()) {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1362 result = 0;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1363 }
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1364
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1365 finally:
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1366 Py_XDECREF(string1);
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1367 Py_XDECREF(string2);
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1368 Py_XDECREF(retval);
52868 2bbb60c00eb7 #5615: make it possible to configure --without-threads again. Georg Brandl <georg@python.org> parents: 51775 diff changeset	1369 #ifdef WITH_THREAD
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1370 PyGILState_Release(gilstate);
52868 2bbb60c00eb7 #5615: make it possible to configure --without-threads again. Georg Brandl <georg@python.org> parents: 51775 diff changeset	1371 #endif
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1372 return result;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1373 }
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1374
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1375 static PyObject *
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1376 pysqlite_connection_interrupt(pysqlite_Connection* self, PyObject* args)
38808 3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	1377 {
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	1378 PyObject* retval = NULL;
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	1379
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1380 if (!pysqlite_check_connection(self)) {
38808 3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	1381 goto finally;
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	1382 }
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	1383
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	1384 sqlite3_interrupt(self->db);
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	1385
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	1386 Py_INCREF(Py_None);
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	1387 retval = Py_None;
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	1388
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	1389 finally:
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	1390 return retval;
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	1391 }
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	1392
46159 f9a629f41656 Accept patch issue2426 by Paul Kippes (kippesp). Gregory P. Smith <greg@mad-scientist.com> parents: 45632 diff changeset	1393 /* Function author: Paul Kippes <kippesp@gmail.com>
f9a629f41656 Accept patch issue2426 by Paul Kippes (kippesp). Gregory P. Smith <greg@mad-scientist.com> parents: 45632 diff changeset	1394 * Class method of Connection to call the Python function _iterdump
f9a629f41656 Accept patch issue2426 by Paul Kippes (kippesp). Gregory P. Smith <greg@mad-scientist.com> parents: 45632 diff changeset	1395 * of the sqlite3 module.
f9a629f41656 Accept patch issue2426 by Paul Kippes (kippesp). Gregory P. Smith <greg@mad-scientist.com> parents: 45632 diff changeset	1396 */
f9a629f41656 Accept patch issue2426 by Paul Kippes (kippesp). Gregory P. Smith <greg@mad-scientist.com> parents: 45632 diff changeset	1397 static PyObject *
f9a629f41656 Accept patch issue2426 by Paul Kippes (kippesp). Gregory P. Smith <greg@mad-scientist.com> parents: 45632 diff changeset	1398 pysqlite_connection_iterdump(pysqlite_Connection* self, PyObject* args)
f9a629f41656 Accept patch issue2426 by Paul Kippes (kippesp). Gregory P. Smith <greg@mad-scientist.com> parents: 45632 diff changeset	1399 {
f9a629f41656 Accept patch issue2426 by Paul Kippes (kippesp). Gregory P. Smith <greg@mad-scientist.com> parents: 45632 diff changeset	1400 PyObject* retval = NULL;
f9a629f41656 Accept patch issue2426 by Paul Kippes (kippesp). Gregory P. Smith <greg@mad-scientist.com> parents: 45632 diff changeset	1401 PyObject* module = NULL;
f9a629f41656 Accept patch issue2426 by Paul Kippes (kippesp). Gregory P. Smith <greg@mad-scientist.com> parents: 45632 diff changeset	1402 PyObject* module_dict;
f9a629f41656 Accept patch issue2426 by Paul Kippes (kippesp). Gregory P. Smith <greg@mad-scientist.com> parents: 45632 diff changeset	1403 PyObject* pyfn_iterdump;
f9a629f41656 Accept patch issue2426 by Paul Kippes (kippesp). Gregory P. Smith <greg@mad-scientist.com> parents: 45632 diff changeset	1404
f9a629f41656 Accept patch issue2426 by Paul Kippes (kippesp). Gregory P. Smith <greg@mad-scientist.com> parents: 45632 diff changeset	1405 if (!pysqlite_check_connection(self)) {
f9a629f41656 Accept patch issue2426 by Paul Kippes (kippesp). Gregory P. Smith <greg@mad-scientist.com> parents: 45632 diff changeset	1406 goto finally;
f9a629f41656 Accept patch issue2426 by Paul Kippes (kippesp). Gregory P. Smith <greg@mad-scientist.com> parents: 45632 diff changeset	1407 }
f9a629f41656 Accept patch issue2426 by Paul Kippes (kippesp). Gregory P. Smith <greg@mad-scientist.com> parents: 45632 diff changeset	1408
f9a629f41656 Accept patch issue2426 by Paul Kippes (kippesp). Gregory P. Smith <greg@mad-scientist.com> parents: 45632 diff changeset	1409 module = PyImport_ImportModule(MODULE_NAME ".dump");
f9a629f41656 Accept patch issue2426 by Paul Kippes (kippesp). Gregory P. Smith <greg@mad-scientist.com> parents: 45632 diff changeset	1410 if (!module) {
f9a629f41656 Accept patch issue2426 by Paul Kippes (kippesp). Gregory P. Smith <greg@mad-scientist.com> parents: 45632 diff changeset	1411 goto finally;
f9a629f41656 Accept patch issue2426 by Paul Kippes (kippesp). Gregory P. Smith <greg@mad-scientist.com> parents: 45632 diff changeset	1412 }
f9a629f41656 Accept patch issue2426 by Paul Kippes (kippesp). Gregory P. Smith <greg@mad-scientist.com> parents: 45632 diff changeset	1413
f9a629f41656 Accept patch issue2426 by Paul Kippes (kippesp). Gregory P. Smith <greg@mad-scientist.com> parents: 45632 diff changeset	1414 module_dict = PyModule_GetDict(module);
f9a629f41656 Accept patch issue2426 by Paul Kippes (kippesp). Gregory P. Smith <greg@mad-scientist.com> parents: 45632 diff changeset	1415 if (!module_dict) {
f9a629f41656 Accept patch issue2426 by Paul Kippes (kippesp). Gregory P. Smith <greg@mad-scientist.com> parents: 45632 diff changeset	1416 goto finally;
f9a629f41656 Accept patch issue2426 by Paul Kippes (kippesp). Gregory P. Smith <greg@mad-scientist.com> parents: 45632 diff changeset	1417 }
f9a629f41656 Accept patch issue2426 by Paul Kippes (kippesp). Gregory P. Smith <greg@mad-scientist.com> parents: 45632 diff changeset	1418
f9a629f41656 Accept patch issue2426 by Paul Kippes (kippesp). Gregory P. Smith <greg@mad-scientist.com> parents: 45632 diff changeset	1419 pyfn_iterdump = PyDict_GetItemString(module_dict, "_iterdump");
f9a629f41656 Accept patch issue2426 by Paul Kippes (kippesp). Gregory P. Smith <greg@mad-scientist.com> parents: 45632 diff changeset	1420 if (!pyfn_iterdump) {
f9a629f41656 Accept patch issue2426 by Paul Kippes (kippesp). Gregory P. Smith <greg@mad-scientist.com> parents: 45632 diff changeset	1421 PyErr_SetString(pysqlite_OperationalError, "Failed to obtain _iterdump() reference");
f9a629f41656 Accept patch issue2426 by Paul Kippes (kippesp). Gregory P. Smith <greg@mad-scientist.com> parents: 45632 diff changeset	1422 goto finally;
f9a629f41656 Accept patch issue2426 by Paul Kippes (kippesp). Gregory P. Smith <greg@mad-scientist.com> parents: 45632 diff changeset	1423 }
f9a629f41656 Accept patch issue2426 by Paul Kippes (kippesp). Gregory P. Smith <greg@mad-scientist.com> parents: 45632 diff changeset	1424
f9a629f41656 Accept patch issue2426 by Paul Kippes (kippesp). Gregory P. Smith <greg@mad-scientist.com> parents: 45632 diff changeset	1425 args = PyTuple_New(1);
f9a629f41656 Accept patch issue2426 by Paul Kippes (kippesp). Gregory P. Smith <greg@mad-scientist.com> parents: 45632 diff changeset	1426 if (!args) {
f9a629f41656 Accept patch issue2426 by Paul Kippes (kippesp). Gregory P. Smith <greg@mad-scientist.com> parents: 45632 diff changeset	1427 goto finally;
f9a629f41656 Accept patch issue2426 by Paul Kippes (kippesp). Gregory P. Smith <greg@mad-scientist.com> parents: 45632 diff changeset	1428 }
f9a629f41656 Accept patch issue2426 by Paul Kippes (kippesp). Gregory P. Smith <greg@mad-scientist.com> parents: 45632 diff changeset	1429 Py_INCREF(self);
f9a629f41656 Accept patch issue2426 by Paul Kippes (kippesp). Gregory P. Smith <greg@mad-scientist.com> parents: 45632 diff changeset	1430 PyTuple_SetItem(args, 0, (PyObject*)self);
f9a629f41656 Accept patch issue2426 by Paul Kippes (kippesp). Gregory P. Smith <greg@mad-scientist.com> parents: 45632 diff changeset	1431 retval = PyObject_CallObject(pyfn_iterdump, args);
f9a629f41656 Accept patch issue2426 by Paul Kippes (kippesp). Gregory P. Smith <greg@mad-scientist.com> parents: 45632 diff changeset	1432
f9a629f41656 Accept patch issue2426 by Paul Kippes (kippesp). Gregory P. Smith <greg@mad-scientist.com> parents: 45632 diff changeset	1433 finally:
f9a629f41656 Accept patch issue2426 by Paul Kippes (kippesp). Gregory P. Smith <greg@mad-scientist.com> parents: 45632 diff changeset	1434 Py_XDECREF(args);
f9a629f41656 Accept patch issue2426 by Paul Kippes (kippesp). Gregory P. Smith <greg@mad-scientist.com> parents: 45632 diff changeset	1435 Py_XDECREF(module);
f9a629f41656 Accept patch issue2426 by Paul Kippes (kippesp). Gregory P. Smith <greg@mad-scientist.com> parents: 45632 diff changeset	1436 return retval;
f9a629f41656 Accept patch issue2426 by Paul Kippes (kippesp). Gregory P. Smith <greg@mad-scientist.com> parents: 45632 diff changeset	1437 }
f9a629f41656 Accept patch issue2426 by Paul Kippes (kippesp). Gregory P. Smith <greg@mad-scientist.com> parents: 45632 diff changeset	1438
38808 3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	1439 static PyObject *
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1440 pysqlite_connection_create_collation(pysqlite_Connection* self, PyObject* args)
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1441 {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1442 PyObject* callable;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1443 PyObject* uppercase_name = 0;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1444 PyObject* name;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1445 PyObject* retval;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1446 char* chk;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1447 int rc;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1448
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1449 if (!pysqlite_check_thread(self) \|\| !pysqlite_check_connection(self)) {
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1450 goto finally;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1451 }
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1452
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	1453 if (!PyArg_ParseTuple(args, "O!O:create_collation(name, callback)", &PyString_Type, &name, &callable)) {
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1454 goto finally;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1455 }
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1456
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1457 uppercase_name = PyObject_CallMethod(name, "upper", "");
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1458 if (!uppercase_name) {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1459 goto finally;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1460 }
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1461
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	1462 chk = PyString_AsString(uppercase_name);
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1463 while (*chk) {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1464 if ((chk >= '0' && chk <= '9')
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1465 \|\| (chk >= 'A' && chk <= 'Z')
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1466 \|\| (*chk == '_'))
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1467 {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1468 chk++;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1469 } else {
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1470 PyErr_SetString(pysqlite_ProgrammingError, "invalid character in collation name");
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1471 goto finally;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1472 }
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1473 }
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1474
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1475 if (callable != Py_None && !PyCallable_Check(callable)) {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1476 PyErr_SetString(PyExc_TypeError, "parameter must be callable");
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1477 goto finally;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1478 }
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1479
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1480 if (callable != Py_None) {
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1481 if (PyDict_SetItem(self->collations, uppercase_name, callable) == -1)
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1482 goto finally;
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1483 } else {
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1484 if (PyDict_DelItem(self->collations, uppercase_name) == -1)
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1485 goto finally;
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1486 }
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1487
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1488 rc = sqlite3_create_collation(self->db,
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	1489 PyString_AsString(uppercase_name),
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1490 SQLITE_UTF8,
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1491 (callable != Py_None) ? callable : NULL,
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1492 (callable != Py_None) ? pysqlite_collation_callback : NULL);
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1493 if (rc != SQLITE_OK) {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1494 PyDict_DelItem(self->collations, uppercase_name);
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1495 _pysqlite_seterror(self->db, NULL);
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1496 goto finally;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1497 }
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1498
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1499 finally:
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1500 Py_XDECREF(uppercase_name);
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1501
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1502 if (PyErr_Occurred()) {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1503 retval = NULL;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1504 } else {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1505 Py_INCREF(Py_None);
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1506 retval = Py_None;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1507 }
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1508
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1509 return retval;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1510 }
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1511
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1512 /* Called when the connection is used as a context manager. Returns itself as a
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1513 * convenience to the caller. */
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1514 static PyObject *
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1515 pysqlite_connection_enter(pysqlite_Connection* self, PyObject* args)
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1516 {
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1517 Py_INCREF(self);
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1518 return (PyObject*)self;
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1519 }
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1520
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1521 /** Called when the connection is used as a context manager. If there was any
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1522 * exception, a rollback takes place; otherwise we commit. */
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1523 static PyObject *
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1524 pysqlite_connection_exit(pysqlite_Connection* self, PyObject* args)
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1525 {
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1526 PyObject* exc_type, exc_value, exc_tb;
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1527 char* method_name;
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1528 PyObject* result;
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1529
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1530 if (!PyArg_ParseTuple(args, "OOO", &exc_type, &exc_value, &exc_tb)) {
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1531 return NULL;
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1532 }
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1533
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1534 if (exc_type == Py_None && exc_value == Py_None && exc_tb == Py_None) {
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1535 method_name = "commit";
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1536 } else {
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1537 method_name = "rollback";
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1538 }
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1539
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1540 result = PyObject_CallMethod((PyObject*)self, method_name, "");
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1541 if (!result) {
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1542 return NULL;
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1543 }
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1544 Py_DECREF(result);
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1545
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1546 Py_INCREF(Py_False);
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1547 return Py_False;
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1548 }
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1549
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1550 static char connection_doc[] =
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	1551 PyDoc_STR("SQLite database connection object.");
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1552
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1553 static PyGetSetDef connection_getset[] = {
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1554 {"isolation_level", (getter)pysqlite_connection_get_isolation_level, (setter)pysqlite_connection_set_isolation_level},
b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1555 {"total_changes", (getter)pysqlite_connection_get_total_changes, (setter)0},
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1556 {NULL}
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1557 };
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1558
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1559 static PyMethodDef connection_methods[] = {
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1560 {"cursor", (PyCFunction)pysqlite_connection_cursor, METH_VARARGS\|METH_KEYWORDS,
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1561 PyDoc_STR("Return a cursor for the connection.")},
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1562 {"close", (PyCFunction)pysqlite_connection_close, METH_NOARGS,
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1563 PyDoc_STR("Closes the connection.")},
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1564 {"commit", (PyCFunction)pysqlite_connection_commit, METH_NOARGS,
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1565 PyDoc_STR("Commit the current transaction.")},
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1566 {"rollback", (PyCFunction)pysqlite_connection_rollback, METH_NOARGS,
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1567 PyDoc_STR("Roll back the current transaction.")},
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1568 {"create_function", (PyCFunction)pysqlite_connection_create_function, METH_VARARGS\|METH_KEYWORDS,
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1569 PyDoc_STR("Creates a new function. Non-standard.")},
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1570 {"create_aggregate", (PyCFunction)pysqlite_connection_create_aggregate, METH_VARARGS\|METH_KEYWORDS,
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1571 PyDoc_STR("Creates a new aggregate. Non-standard.")},
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1572 {"set_authorizer", (PyCFunction)pysqlite_connection_set_authorizer, METH_VARARGS\|METH_KEYWORDS,
38808 3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	1573 PyDoc_STR("Sets authorizer callback. Non-standard.")},
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1574 #ifdef HAVE_LOAD_EXTENSION
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1575 {"enable_load_extension", (PyCFunction)pysqlite_enable_load_extension, METH_VARARGS,
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1576 PyDoc_STR("Enable dynamic loading of SQLite extension modules. Non-standard.")},
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1577 {"load_extension", (PyCFunction)pysqlite_load_extension, METH_VARARGS,
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1578 PyDoc_STR("Load SQLite extension module. Non-standard.")},
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 52868 diff changeset	1579 #endif
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1580 {"set_progress_handler", (PyCFunction)pysqlite_connection_set_progress_handler, METH_VARARGS\|METH_KEYWORDS,
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1581 PyDoc_STR("Sets progress handler callback. Non-standard.")},
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1582 {"execute", (PyCFunction)pysqlite_connection_execute, METH_VARARGS,
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1583 PyDoc_STR("Executes a SQL statement. Non-standard.")},
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1584 {"executemany", (PyCFunction)pysqlite_connection_executemany, METH_VARARGS,
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1585 PyDoc_STR("Repeatedly executes a SQL statement. Non-standard.")},
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1586 {"executescript", (PyCFunction)pysqlite_connection_executescript, METH_VARARGS,
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1587 PyDoc_STR("Executes a multiple SQL statements at once. Non-standard.")},
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1588 {"create_collation", (PyCFunction)pysqlite_connection_create_collation, METH_VARARGS,
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37763 diff changeset	1589 PyDoc_STR("Creates a collation function. Non-standard.")},
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1590 {"interrupt", (PyCFunction)pysqlite_connection_interrupt, METH_NOARGS,
38808 3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 37938 diff changeset	1591 PyDoc_STR("Abort any pending database operation. Non-standard.")},
46159 f9a629f41656 Accept patch issue2426 by Paul Kippes (kippesp). Gregory P. Smith <greg@mad-scientist.com> parents: 45632 diff changeset	1592 {"iterdump", (PyCFunction)pysqlite_connection_iterdump, METH_NOARGS,
49153 ff15e62a349b sqlite3 module: Mark iterdump() method as "Non-standard" like all the other methods not found in DB-API. Gerhard Häring <gh@ghaering.de> parents: 47991 diff changeset	1593 PyDoc_STR("Returns iterator to the dump of the database in an SQL text format. Non-standard.")},
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1594 {"__enter__", (PyCFunction)pysqlite_connection_enter, METH_NOARGS,
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1595 PyDoc_STR("For context manager. Non-standard.")},
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1596 {"__exit__", (PyCFunction)pysqlite_connection_exit, METH_VARARGS,
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44350 diff changeset	1597 PyDoc_STR("For context manager. Non-standard.")},
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1598 {NULL, NULL}
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1599 };
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1600
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1601 static struct PyMemberDef connection_members[] =
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1602 {
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1603 {"Warning", T_OBJECT, offsetof(pysqlite_Connection, Warning), RO},
b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1604 {"Error", T_OBJECT, offsetof(pysqlite_Connection, Error), RO},
b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1605 {"InterfaceError", T_OBJECT, offsetof(pysqlite_Connection, InterfaceError), RO},
b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1606 {"DatabaseError", T_OBJECT, offsetof(pysqlite_Connection, DatabaseError), RO},
b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1607 {"DataError", T_OBJECT, offsetof(pysqlite_Connection, DataError), RO},
b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1608 {"OperationalError", T_OBJECT, offsetof(pysqlite_Connection, OperationalError), RO},
b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1609 {"IntegrityError", T_OBJECT, offsetof(pysqlite_Connection, IntegrityError), RO},
b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1610 {"InternalError", T_OBJECT, offsetof(pysqlite_Connection, InternalError), RO},
b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1611 {"ProgrammingError", T_OBJECT, offsetof(pysqlite_Connection, ProgrammingError), RO},
b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1612 {"NotSupportedError", T_OBJECT, offsetof(pysqlite_Connection, NotSupportedError), RO},
b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1613 {"row_factory", T_OBJECT, offsetof(pysqlite_Connection, row_factory)},
b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1614 {"text_factory", T_OBJECT, offsetof(pysqlite_Connection, text_factory)},
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1615 {NULL}
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1616 };
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1617
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1618 PyTypeObject pysqlite_ConnectionType = {
42333 6620a510e9a9 PEP 3123: Provide forward compatibility with Python 3.0, while keeping Martin v. Löwis <martin@v.loewis.de> parents: 40625 diff changeset	1619 PyVarObject_HEAD_INIT(NULL, 0)
37495 d3969aeba777 upgrade to final version of pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37458 diff changeset	1620 MODULE_NAME ".Connection", /* tp_name */
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1621 sizeof(pysqlite_Connection), /* tp_basicsize */
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1622 0, /* tp_itemsize */
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1623 (destructor)pysqlite_connection_dealloc, /* tp_dealloc */
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1624 0, /* tp_print */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1625 0, /* tp_getattr */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1626 0, /* tp_setattr */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1627 0, /* tp_compare */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1628 0, /* tp_repr */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1629 0, /* tp_as_number */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1630 0, /* tp_as_sequence */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1631 0, /* tp_as_mapping */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1632 0, /* tp_hash */
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1633 (ternaryfunc)pysqlite_connection_call, /* tp_call */
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1634 0, /* tp_str */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1635 0, /* tp_getattro */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1636 0, /* tp_setattro */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1637 0, /* tp_as_buffer */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1638 Py_TPFLAGS_DEFAULT\|Py_TPFLAGS_BASETYPE, /* tp_flags */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1639 connection_doc, /* tp_doc */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1640 0, /* tp_traverse */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1641 0, /* tp_clear */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1642 0, /* tp_richcompare */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1643 0, /* tp_weaklistoffset */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1644 0, /* tp_iter */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1645 0, /* tp_iternext */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1646 connection_methods, /* tp_methods */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1647 connection_members, /* tp_members */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1648 connection_getset, /* tp_getset */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1649 0, /* tp_base */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1650 0, /* tp_dict */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1651 0, /* tp_descr_get */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1652 0, /* tp_descr_set */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1653 0, /* tp_dictoffset */
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1654 (initproc)pysqlite_connection_init, /* tp_init */
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1655 0, /* tp_alloc */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1656 0, /* tp_new */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1657 0 /* tp_free */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1658 };
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1659
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1660 extern int pysqlite_connection_setup_types(void)
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1661 {
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1662 pysqlite_ConnectionType.tp_new = PyType_GenericNew;
b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 38883 diff changeset	1663 return PyType_Ready(&pysqlite_ConnectionType);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1664 }

Mercurial > cpython-lru_cache-weakref

annotate Modules/_sqlite/connection.c @ 65035:87f4b32905df 2.7