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

annotate Modules/_sqlite/connection.c @ 49961:e793fc3c8abe

More 3.0 -> 3.1 transistion in the Windows and OS/2 build files

author	Christian Heimes <christian@cheimes.de>
date	Thu, 04 Dec 2008 14:27:25 +0000
parents	8f886acaa142
children	87fbbf22adf3

rev	line source
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1 /* connection.c - the connection type
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	2 *
46178 e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	3 * Copyright (C) 2004-2007 Gerhard Häring <gh@ghaering.de>
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	4 *
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	5 * This file is part of pysqlite.
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	6 *
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	7 * This software is provided 'as-is', without any express or implied
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	8 * warranty. In no event will the authors be held liable for any damages
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	9 * arising from the use of this software.
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	10 *
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	11 * Permission is granted to anyone to use this software for any purpose,
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	12 * including commercial applications, and to alter it and redistribute it
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	13 * freely, subject to the following restrictions:
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	14 *
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	15 * 1. The origin of this software must not be misrepresented; you must not
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	16 * claim that you wrote the original software. If you use this software
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	17 * in a product, an acknowledgment in the product documentation would be
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	18 * appreciated but is not required.
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	19 * 2. Altered source versions must be plainly marked as such, and must not be
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	20 * misrepresented as being the original software.
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	21 * 3. This notice may not be removed or altered from any source distribution.
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	22 */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	23
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	24 #include "cache.h"
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	25 #include "module.h"
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	26 #include "connection.h"
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	27 #include "statement.h"
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	28 #include "cursor.h"
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	29 #include "prepare_protocol.h"
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	30 #include "util.h"
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	31 #include "sqlitecompat.h"
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	32
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	33 #include "pythread.h"
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	34
46178 e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	35 #define ACTION_FINALIZE 1
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	36 #define ACTION_RESET 2
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	37
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	38 static int pysqlite_connection_set_isolation_level(pysqlite_Connection* self, PyObject* isolation_level);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	39
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	40
49178 8f886acaa142 Merged revisions 66394,66404,66412,66414,66424-66436 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	41 static void _sqlite3_result_error(sqlite3_context* ctx, const char* errmsg, int len)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	42 {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	43 /* in older SQLite versions, calling sqlite3_result_error in callbacks
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	44 * triggers a bug in SQLite that leads either to irritating results or
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	45 * segfaults, depending on the SQLite version */
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	46 #if SQLITE_VERSION_NUMBER >= 3003003
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	47 sqlite3_result_error(ctx, errmsg, len);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	48 #else
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	49 PyErr_SetString(pysqlite_OperationalError, errmsg);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	50 #endif
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	51 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	52
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	53 int pysqlite_connection_init(pysqlite_Connection* self, PyObject* args, PyObject* kwargs)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	54 {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	55 static char *kwlist[] = {"database", "timeout", "detect_types", "isolation_level", "check_same_thread", "factory", "cached_statements", NULL, NULL};
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	56
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	57 char* database;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	58 int detect_types = 0;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	59 PyObject* isolation_level = NULL;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	60 PyObject* factory = NULL;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	61 int check_same_thread = 1;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	62 int cached_statements = 100;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	63 double timeout = 5.0;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	64 int rc;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	65
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	66 if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s\|diOiOi", kwlist,
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	67 &database, &timeout, &detect_types, &isolation_level, &check_same_thread, &factory, &cached_statements))
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	68 {
46178 e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	69 return -1;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	70 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	71
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	72 self->begin_statement = NULL;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	73
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	74 self->statement_cache = NULL;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	75 self->statements = NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	76
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	77 Py_INCREF(Py_None);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	78 self->row_factory = Py_None;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	79
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	80 Py_INCREF(&PyUnicode_Type);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	81 self->text_factory = (PyObject*)&PyUnicode_Type;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	82
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	83 Py_BEGIN_ALLOW_THREADS
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	84 rc = sqlite3_open(database, &self->db);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	85 Py_END_ALLOW_THREADS
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	86
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	87 if (rc != SQLITE_OK) {
46178 e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	88 _pysqlite_seterror(self->db, NULL);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	89 return -1;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	90 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	91
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	92 if (!isolation_level) {
43694 b102b8361d5e Use unicode in more places. Fixes a problem with str8 + str in test. Neal Norwitz <nnorwitz@gmail.com> parents: 43490 diff changeset	93 isolation_level = PyUnicode_FromString("");
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	94 if (!isolation_level) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	95 return -1;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	96 }
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	97 } else {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	98 Py_INCREF(isolation_level);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	99 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	100 self->isolation_level = NULL;
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	101 pysqlite_connection_set_isolation_level(self, isolation_level);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	102 Py_DECREF(isolation_level);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	103
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	104 self->statement_cache = (pysqlite_Cache)PyObject_CallFunction((PyObject)&pysqlite_CacheType, "Oi", self, cached_statements);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	105 if (PyErr_Occurred()) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	106 return -1;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	107 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	108
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	109 self->statements = PyList_New(0);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	110 if (!self->statements) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	111 return -1;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	112 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	113 self->created_statements = 0;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	114
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	115 /* By default, the Cache class INCREFs the factory in its initializer, and
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	116 * decrefs it in its deallocator method. Since this would create a circular
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	117 * reference here, we're breaking it by decrementing self, and telling the
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	118 * cache class to not decref the factory (self) in its deallocator.
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	119 */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	120 self->statement_cache->decref_factory = 0;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	121 Py_DECREF(self);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	122
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	123 self->inTransaction = 0;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	124 self->detect_types = detect_types;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	125 self->timeout = timeout;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	126 (void)sqlite3_busy_timeout(self->db, (int)(timeout*1000));
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	127
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	128 self->thread_ident = PyThread_get_thread_ident();
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	129 self->check_same_thread = check_same_thread;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	130
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	131 self->function_pinboard = PyDict_New();
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	132 if (!self->function_pinboard) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	133 return -1;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	134 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	135
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	136 self->collations = PyDict_New();
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	137 if (!self->collations) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	138 return -1;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	139 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	140
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	141 self->Warning = pysqlite_Warning;
47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	142 self->Error = pysqlite_Error;
47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	143 self->InterfaceError = pysqlite_InterfaceError;
47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	144 self->DatabaseError = pysqlite_DatabaseError;
47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	145 self->DataError = pysqlite_DataError;
47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	146 self->OperationalError = pysqlite_OperationalError;
47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	147 self->IntegrityError = pysqlite_IntegrityError;
47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	148 self->InternalError = pysqlite_InternalError;
47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	149 self->ProgrammingError = pysqlite_ProgrammingError;
47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	150 self->NotSupportedError = pysqlite_NotSupportedError;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	151
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	152 return 0;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	153 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	154
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	155 /* Empty the entire statement cache of this connection */
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	156 void pysqlite_flush_statement_cache(pysqlite_Connection* self)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	157 {
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	158 pysqlite_Node* node;
47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	159 pysqlite_Statement* statement;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	160
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	161 node = self->statement_cache->first;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	162
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	163 while (node) {
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	164 statement = (pysqlite_Statement*)(node->data);
47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	165 (void)pysqlite_statement_finalize(statement);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	166 node = node->next;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	167 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	168
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	169 Py_DECREF(self->statement_cache);
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	170 self->statement_cache = (pysqlite_Cache)PyObject_CallFunction((PyObject)&pysqlite_CacheType, "O", self);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	171 Py_DECREF(self);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	172 self->statement_cache->decref_factory = 0;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	173 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	174
46178 e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	175 /* action in (ACTION_RESET, ACTION_FINALIZE) */
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	176 void pysqlite_do_all_statements(pysqlite_Connection* self, int action)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	177 {
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	178 int i;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	179 PyObject* weakref;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	180 PyObject* statement;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	181
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	182 for (i = 0; i < PyList_Size(self->statements); i++) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	183 weakref = PyList_GetItem(self->statements, i);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	184 statement = PyWeakref_GetObject(weakref);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	185 if (statement != Py_None) {
46178 e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	186 if (action == ACTION_RESET) {
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	187 (void)pysqlite_statement_reset((pysqlite_Statement*)statement);
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	188 } else {
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	189 (void)pysqlite_statement_finalize((pysqlite_Statement*)statement);
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	190 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	191 }
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	192 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	193 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	194
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	195 void pysqlite_connection_dealloc(pysqlite_Connection* self)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	196 {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	197 Py_XDECREF(self->statement_cache);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	198
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	199 /* Clean up if user has not called .close() explicitly. */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	200 if (self->db) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	201 Py_BEGIN_ALLOW_THREADS
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	202 sqlite3_close(self->db);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	203 Py_END_ALLOW_THREADS
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	204 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	205
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	206 if (self->begin_statement) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	207 PyMem_Free(self->begin_statement);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	208 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	209 Py_XDECREF(self->isolation_level);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	210 Py_XDECREF(self->function_pinboard);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	211 Py_XDECREF(self->row_factory);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	212 Py_XDECREF(self->text_factory);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	213 Py_XDECREF(self->collations);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	214 Py_XDECREF(self->statements);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	215
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	216 Py_TYPE(self)->tp_free((PyObject*)self);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	217 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	218
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	219 PyObject* pysqlite_connection_cursor(pysqlite_Connection* self, PyObject* args, PyObject* kwargs)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	220 {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	221 static char *kwlist[] = {"factory", NULL, NULL};
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	222 PyObject* factory = NULL;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	223 PyObject* cursor;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	224
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	225
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	226 if (!PyArg_ParseTupleAndKeywords(args, kwargs, "\|O", kwlist,
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	227 &factory)) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	228 return NULL;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	229 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	230
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	231 if (!pysqlite_check_thread(self) \|\| !pysqlite_check_connection(self)) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	232 return NULL;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	233 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	234
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	235 if (factory == NULL) {
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	236 factory = (PyObject*)&pysqlite_CursorType;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	237 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	238
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	239 cursor = PyObject_CallFunction(factory, "O", self);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	240
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	241 if (cursor && self->row_factory != Py_None) {
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	242 Py_XDECREF(((pysqlite_Cursor*)cursor)->row_factory);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	243 Py_INCREF(self->row_factory);
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	244 ((pysqlite_Cursor*)cursor)->row_factory = self->row_factory;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	245 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	246
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	247 return cursor;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	248 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	249
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	250 PyObject* pysqlite_connection_close(pysqlite_Connection* self, PyObject* args)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	251 {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	252 int rc;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	253
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	254 if (!pysqlite_check_thread(self)) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	255 return NULL;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	256 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	257
46178 e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	258 pysqlite_do_all_statements(self, ACTION_FINALIZE);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	259
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	260 if (self->db) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	261 Py_BEGIN_ALLOW_THREADS
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	262 rc = sqlite3_close(self->db);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	263 Py_END_ALLOW_THREADS
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	264
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	265 if (rc != SQLITE_OK) {
46178 e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	266 _pysqlite_seterror(self->db, NULL);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	267 return NULL;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	268 } else {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	269 self->db = NULL;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	270 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	271 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	272
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	273 Py_INCREF(Py_None);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	274 return Py_None;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	275 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	276
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	277 /*
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	278 * Checks if a connection object is usable (i. e. not closed).
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	279 *
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	280 * 0 => error; 1 => ok
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	281 */
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	282 int pysqlite_check_connection(pysqlite_Connection* con)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	283 {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	284 if (!con->db) {
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	285 PyErr_SetString(pysqlite_ProgrammingError, "Cannot operate on a closed database.");
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	286 return 0;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	287 } else {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	288 return 1;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	289 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	290 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	291
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	292 PyObject* _pysqlite_connection_begin(pysqlite_Connection* self)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	293 {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	294 int rc;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	295 const char* tail;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	296 sqlite3_stmt* statement;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	297
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	298 Py_BEGIN_ALLOW_THREADS
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	299 rc = sqlite3_prepare(self->db, self->begin_statement, -1, &statement, &tail);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	300 Py_END_ALLOW_THREADS
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	301
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	302 if (rc != SQLITE_OK) {
46178 e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	303 _pysqlite_seterror(self->db, statement);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	304 goto error;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	305 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	306
49178 8f886acaa142 Merged revisions 66394,66404,66412,66414,66424-66436 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	307 rc = pysqlite_step(statement, self);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	308 if (rc == SQLITE_DONE) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	309 self->inTransaction = 1;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	310 } else {
46178 e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	311 _pysqlite_seterror(self->db, statement);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	312 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	313
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	314 Py_BEGIN_ALLOW_THREADS
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	315 rc = sqlite3_finalize(statement);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	316 Py_END_ALLOW_THREADS
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	317
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	318 if (rc != SQLITE_OK && !PyErr_Occurred()) {
46178 e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	319 _pysqlite_seterror(self->db, NULL);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	320 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	321
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	322 error:
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	323 if (PyErr_Occurred()) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	324 return NULL;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	325 } else {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	326 Py_INCREF(Py_None);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	327 return Py_None;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	328 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	329 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	330
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	331 PyObject* pysqlite_connection_commit(pysqlite_Connection* self, PyObject* args)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	332 {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	333 int rc;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	334 const char* tail;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	335 sqlite3_stmt* statement;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	336
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	337 if (!pysqlite_check_thread(self) \|\| !pysqlite_check_connection(self)) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	338 return NULL;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	339 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	340
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	341 if (self->inTransaction) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	342 Py_BEGIN_ALLOW_THREADS
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	343 rc = sqlite3_prepare(self->db, "COMMIT", -1, &statement, &tail);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	344 Py_END_ALLOW_THREADS
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	345 if (rc != SQLITE_OK) {
46178 e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	346 _pysqlite_seterror(self->db, NULL);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	347 goto error;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	348 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	349
49178 8f886acaa142 Merged revisions 66394,66404,66412,66414,66424-66436 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	350 rc = pysqlite_step(statement, self);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	351 if (rc == SQLITE_DONE) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	352 self->inTransaction = 0;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	353 } else {
46178 e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	354 _pysqlite_seterror(self->db, statement);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	355 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	356
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	357 Py_BEGIN_ALLOW_THREADS
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	358 rc = sqlite3_finalize(statement);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	359 Py_END_ALLOW_THREADS
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	360 if (rc != SQLITE_OK && !PyErr_Occurred()) {
46178 e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	361 _pysqlite_seterror(self->db, NULL);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	362 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	363
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	364 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	365
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	366 error:
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	367 if (PyErr_Occurred()) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	368 return NULL;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	369 } else {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	370 Py_INCREF(Py_None);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	371 return Py_None;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	372 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	373 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	374
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	375 PyObject* pysqlite_connection_rollback(pysqlite_Connection* self, PyObject* args)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	376 {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	377 int rc;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	378 const char* tail;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	379 sqlite3_stmt* statement;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	380
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	381 if (!pysqlite_check_thread(self) \|\| !pysqlite_check_connection(self)) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	382 return NULL;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	383 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	384
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	385 if (self->inTransaction) {
46178 e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	386 pysqlite_do_all_statements(self, ACTION_RESET);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	387
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	388 Py_BEGIN_ALLOW_THREADS
42543 a44c564026b8 Fix automatic replacing mistake. Georg Brandl <georg@python.org> parents: 42541 diff changeset	389 rc = sqlite3_prepare(self->db, "ROLLBACK", -1, &statement, &tail);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	390 Py_END_ALLOW_THREADS
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	391 if (rc != SQLITE_OK) {
46178 e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	392 _pysqlite_seterror(self->db, NULL);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	393 goto error;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	394 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	395
49178 8f886acaa142 Merged revisions 66394,66404,66412,66414,66424-66436 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	396 rc = pysqlite_step(statement, self);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	397 if (rc == SQLITE_DONE) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	398 self->inTransaction = 0;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	399 } else {
46178 e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	400 _pysqlite_seterror(self->db, statement);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	401 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	402
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	403 Py_BEGIN_ALLOW_THREADS
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	404 rc = sqlite3_finalize(statement);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	405 Py_END_ALLOW_THREADS
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	406 if (rc != SQLITE_OK && !PyErr_Occurred()) {
46178 e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	407 _pysqlite_seterror(self->db, NULL);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	408 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	409
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	410 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	411
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	412 error:
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	413 if (PyErr_Occurred()) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	414 return NULL;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	415 } else {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	416 Py_INCREF(Py_None);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	417 return Py_None;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	418 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	419 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	420
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	421 void _pysqlite_set_result(sqlite3_context* context, PyObject* py_val)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	422 {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	423 long longval;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	424 const char* buffer;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	425 Py_ssize_t buflen;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	426
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	427 if ((!py_val) \|\| PyErr_Occurred()) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	428 sqlite3_result_null(context);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	429 } else if (py_val == Py_None) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	430 sqlite3_result_null(context);
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 44018 diff changeset	431 } else if (PyLong_Check(py_val)) {
f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 44018 diff changeset	432 longval = PyLong_AsLong(py_val);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	433 sqlite3_result_int64(context, (PY_LONG_LONG)longval);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	434 } else if (PyFloat_Check(py_val)) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	435 sqlite3_result_double(context, PyFloat_AsDouble(py_val));
43487 8c10aac37037 Breaking ground for PEP 3137 implementation: Guido van Rossum <guido@python.org> parents: 42543 diff changeset	436 } else if (PyUnicode_Check(py_val)) {
48660 85b67fb5672b Rename PyUnicode_AsString -> _PyUnicode_AsString and Marc-André Lemburg <mal@egenix.com> parents: 48563 diff changeset	437 sqlite3_result_text(context, _PyUnicode_AsString(py_val), -1, SQLITE_TRANSIENT);
43487 8c10aac37037 Breaking ground for PEP 3137 implementation: Guido van Rossum <guido@python.org> parents: 42543 diff changeset	438 } else if (PyObject_CheckBuffer(py_val)) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	439 if (PyObject_AsCharBuffer(py_val, &buffer, &buflen) != 0) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	440 PyErr_SetString(PyExc_ValueError, "could not convert BLOB to buffer");
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	441 } else {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	442 sqlite3_result_blob(context, buffer, buflen, SQLITE_TRANSIENT);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	443 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	444 } else {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	445 /* TODO: raise error */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	446 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	447 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	448
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	449 PyObject* _pysqlite_build_py_params(sqlite3_context context, int argc, sqlite3_value* argv)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	450 {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	451 PyObject* args;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	452 int i;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	453 sqlite3_value* cur_value;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	454 PyObject* cur_py_value;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	455 const char* val_str;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	456 PY_LONG_LONG val_int;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	457 Py_ssize_t buflen;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	458
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	459 args = PyTuple_New(argc);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	460 if (!args) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	461 return NULL;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	462 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	463
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	464 for (i = 0; i < argc; i++) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	465 cur_value = argv[i];
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	466 switch (sqlite3_value_type(argv[i])) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	467 case SQLITE_INTEGER:
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	468 val_int = sqlite3_value_int64(cur_value);
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 44018 diff changeset	469 cur_py_value = PyLong_FromLong((long)val_int);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	470 break;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	471 case SQLITE_FLOAT:
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	472 cur_py_value = PyFloat_FromDouble(sqlite3_value_double(cur_value));
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	473 break;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	474 case SQLITE_TEXT:
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	475 val_str = (const char*)sqlite3_value_text(cur_value);
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43694 diff changeset	476 cur_py_value = PyUnicode_FromString(val_str);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	477 /* TODO: have a way to show errors here */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	478 if (!cur_py_value) {
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	479 PyErr_Clear();
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	480 Py_INCREF(Py_None);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	481 cur_py_value = Py_None;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	482 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	483 break;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	484 case SQLITE_BLOB:
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	485 buflen = sqlite3_value_bytes(cur_value);
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46178 diff changeset	486 cur_py_value = PyBytes_FromStringAndSize(
43487 8c10aac37037 Breaking ground for PEP 3137 implementation: Guido van Rossum <guido@python.org> parents: 42543 diff changeset	487 sqlite3_value_blob(cur_value), buflen);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	488 break;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	489 case SQLITE_NULL:
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	490 default:
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	491 Py_INCREF(Py_None);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	492 cur_py_value = Py_None;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	493 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	494
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	495 if (!cur_py_value) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	496 Py_DECREF(args);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	497 return NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	498 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	499
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	500 PyTuple_SetItem(args, i, cur_py_value);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	501
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	502 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	503
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	504 return args;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	505 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	506
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	507 void _pysqlite_func_callback(sqlite3_context* context, int argc, sqlite3_value** argv)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	508 {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	509 PyObject* args;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	510 PyObject* py_func;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	511 PyObject* py_retval = NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	512
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	513 PyGILState_STATE threadstate;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	514
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	515 threadstate = PyGILState_Ensure();
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	516
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	517 py_func = (PyObject*)sqlite3_user_data(context);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	518
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	519 args = _pysqlite_build_py_params(context, argc, argv);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	520 if (args) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	521 py_retval = PyObject_CallObject(py_func, args);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	522 Py_DECREF(args);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	523 }
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	524
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	525 if (py_retval) {
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	526 _pysqlite_set_result(context, py_retval);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	527 Py_DECREF(py_retval);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	528 } else {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	529 if (_enable_callback_tracebacks) {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	530 PyErr_Print();
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	531 } else {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	532 PyErr_Clear();
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	533 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	534 _sqlite3_result_error(context, "user-defined function raised exception", -1);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	535 }
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	536
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	537 PyGILState_Release(threadstate);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	538 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	539
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	540 static void _pysqlite_step_callback(sqlite3_context context, int argc, sqlite3_value* params)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	541 {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	542 PyObject* args;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	543 PyObject* function_result = NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	544 PyObject* aggregate_class;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	545 PyObject** aggregate_instance;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	546 PyObject* stepmethod = NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	547
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	548 PyGILState_STATE threadstate;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	549
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	550 threadstate = PyGILState_Ensure();
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	551
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	552 aggregate_class = (PyObject*)sqlite3_user_data(context);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	553
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	554 aggregate_instance = (PyObject*)sqlite3_aggregate_context(context, sizeof(PyObject));
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	555
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	556 if (*aggregate_instance == 0) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	557 *aggregate_instance = PyObject_CallFunction(aggregate_class, "");
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	558
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	559 if (PyErr_Occurred()) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	560 *aggregate_instance = 0;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	561 if (_enable_callback_tracebacks) {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	562 PyErr_Print();
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	563 } else {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	564 PyErr_Clear();
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	565 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	566 _sqlite3_result_error(context, "user-defined aggregate's '__init__' method raised error", -1);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	567 goto error;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	568 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	569 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	570
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	571 stepmethod = PyObject_GetAttrString(*aggregate_instance, "step");
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	572 if (!stepmethod) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	573 goto error;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	574 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	575
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	576 args = _pysqlite_build_py_params(context, argc, params);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	577 if (!args) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	578 goto error;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	579 }
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	580
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	581 function_result = PyObject_CallObject(stepmethod, args);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	582 Py_DECREF(args);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	583
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	584 if (!function_result) {
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	585 if (_enable_callback_tracebacks) {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	586 PyErr_Print();
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	587 } else {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	588 PyErr_Clear();
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	589 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	590 _sqlite3_result_error(context, "user-defined aggregate's 'step' method raised error", -1);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	591 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	592
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	593 error:
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	594 Py_XDECREF(stepmethod);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	595 Py_XDECREF(function_result);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	596
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	597 PyGILState_Release(threadstate);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	598 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	599
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	600 void _pysqlite_final_callback(sqlite3_context* context)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	601 {
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	602 PyObject* function_result = NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	603 PyObject** aggregate_instance;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	604 PyObject* aggregate_class;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	605
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	606 PyGILState_STATE threadstate;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	607
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	608 threadstate = PyGILState_Ensure();
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	609
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	610 aggregate_class = (PyObject*)sqlite3_user_data(context);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	611
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	612 aggregate_instance = (PyObject*)sqlite3_aggregate_context(context, sizeof(PyObject));
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	613 if (!*aggregate_instance) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	614 /* this branch is executed if there was an exception in the aggregate's
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	615 * __init__ */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	616
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	617 goto error;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	618 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	619
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	620 function_result = PyObject_CallMethod(*aggregate_instance, "finalize", "");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	621 if (!function_result) {
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	622 if (_enable_callback_tracebacks) {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	623 PyErr_Print();
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	624 } else {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	625 PyErr_Clear();
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	626 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	627 _sqlite3_result_error(context, "user-defined aggregate's 'finalize' method raised error", -1);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	628 } else {
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	629 _pysqlite_set_result(context, function_result);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	630 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	631
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	632 error:
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	633 Py_XDECREF(*aggregate_instance);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	634 Py_XDECREF(function_result);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	635
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	636 PyGILState_Release(threadstate);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	637 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	638
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	639 void _pysqlite_drop_unused_statement_references(pysqlite_Connection* self)
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	640 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	641 PyObject* new_list;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	642 PyObject* weakref;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	643 int i;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	644
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	645 /* we only need to do this once in a while */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	646 if (self->created_statements++ < 200) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	647 return;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	648 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	649
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	650 self->created_statements = 0;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	651
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	652 new_list = PyList_New(0);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	653 if (!new_list) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	654 return;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	655 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	656
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	657 for (i = 0; i < PyList_Size(self->statements); i++) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	658 weakref = PyList_GetItem(self->statements, i);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	659 if (PyWeakref_GetObject(weakref) != Py_None) {
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	660 if (PyList_Append(new_list, weakref) != 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	661 Py_DECREF(new_list);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	662 return;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	663 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	664 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	665 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	666
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	667 Py_DECREF(self->statements);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	668 self->statements = new_list;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	669 }
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	670
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	671 PyObject* pysqlite_connection_create_function(pysqlite_Connection* self, PyObject* args, PyObject* kwargs)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	672 {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	673 static char *kwlist[] = {"name", "narg", "func", NULL, NULL};
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	674
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	675 PyObject* func;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	676 char* name;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	677 int narg;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	678 int rc;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	679
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	680 if (!PyArg_ParseTupleAndKeywords(args, kwargs, "siO", kwlist,
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	681 &name, &narg, &func))
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	682 {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	683 return NULL;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	684 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	685
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	686 rc = sqlite3_create_function(self->db, name, narg, SQLITE_UTF8, (void*)func, _pysqlite_func_callback, NULL, NULL);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	687
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	688 if (rc != SQLITE_OK) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	689 /* Workaround for SQLite bug: no error code or string is available here */
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	690 PyErr_SetString(pysqlite_OperationalError, "Error creating function");
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	691 return NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	692 } else {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	693 PyDict_SetItem(self->function_pinboard, func, Py_None);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	694
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	695 Py_INCREF(Py_None);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	696 return Py_None;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	697 }
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	698 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	699
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	700 PyObject* pysqlite_connection_create_aggregate(pysqlite_Connection* self, PyObject* args, PyObject* kwargs)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	701 {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	702 PyObject* aggregate_class;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	703
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	704 int n_arg;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	705 char* name;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	706 static char *kwlist[] = { "name", "n_arg", "aggregate_class", NULL };
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	707 int rc;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	708
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	709 if (!PyArg_ParseTupleAndKeywords(args, kwargs, "siO:create_aggregate",
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	710 kwlist, &name, &n_arg, &aggregate_class)) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	711 return NULL;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	712 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	713
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	714 rc = sqlite3_create_function(self->db, name, n_arg, SQLITE_UTF8, (void*)aggregate_class, 0, &_pysqlite_step_callback, &_pysqlite_final_callback);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	715 if (rc != SQLITE_OK) {
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	716 /* Workaround for SQLite bug: no error code or string is available here */
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	717 PyErr_SetString(pysqlite_OperationalError, "Error creating aggregate");
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	718 return NULL;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	719 } else {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	720 PyDict_SetItem(self->function_pinboard, aggregate_class, Py_None);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	721
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	722 Py_INCREF(Py_None);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	723 return Py_None;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	724 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	725 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	726
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	727 static int _authorizer_callback(void* user_arg, int action, const char* arg1, const char* arg2 , const char* dbname, const char* access_attempt_source)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	728 {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	729 PyObject *ret;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	730 int rc;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	731 PyGILState_STATE gilstate;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	732
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	733 gilstate = PyGILState_Ensure();
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	734 ret = PyObject_CallFunction((PyObject*)user_arg, "issss", action, arg1, arg2, dbname, access_attempt_source);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	735
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	736 if (!ret) {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	737 if (_enable_callback_tracebacks) {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	738 PyErr_Print();
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	739 } else {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	740 PyErr_Clear();
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	741 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	742
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	743 rc = SQLITE_DENY;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	744 } else {
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 44018 diff changeset	745 if (PyLong_Check(ret)) {
f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 44018 diff changeset	746 rc = (int)PyLong_AsLong(ret);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	747 } else {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	748 rc = SQLITE_DENY;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	749 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	750 Py_DECREF(ret);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	751 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	752
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	753 PyGILState_Release(gilstate);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	754 return rc;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	755 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	756
46178 e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	757 static int _progress_handler(void* user_arg)
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	758 {
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	759 int rc;
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	760 PyObject *ret;
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	761 PyGILState_STATE gilstate;
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	762
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	763 gilstate = PyGILState_Ensure();
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	764 ret = PyObject_CallFunction((PyObject*)user_arg, "");
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	765
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	766 if (!ret) {
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	767 if (_enable_callback_tracebacks) {
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	768 PyErr_Print();
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	769 } else {
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	770 PyErr_Clear();
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	771 }
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	772
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	773 /* abort query if error occured */
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	774 rc = 1;
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	775 } else {
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	776 rc = (int)PyObject_IsTrue(ret);
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	777 Py_DECREF(ret);
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	778 }
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	779
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	780 PyGILState_Release(gilstate);
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	781 return rc;
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	782 }
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	783
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	784 PyObject* pysqlite_connection_set_authorizer(pysqlite_Connection* self, PyObject* args, PyObject* kwargs)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	785 {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	786 PyObject* authorizer_cb;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	787
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	788 static char *kwlist[] = { "authorizer_callback", NULL };
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	789 int rc;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	790
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	791 if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O:set_authorizer",
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	792 kwlist, &authorizer_cb)) {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	793 return NULL;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	794 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	795
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	796 rc = sqlite3_set_authorizer(self->db, _authorizer_callback, (void*)authorizer_cb);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	797
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	798 if (rc != SQLITE_OK) {
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	799 PyErr_SetString(pysqlite_OperationalError, "Error setting authorizer callback");
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	800 return NULL;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	801 } else {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	802 PyDict_SetItem(self->function_pinboard, authorizer_cb, Py_None);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	803
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	804 Py_INCREF(Py_None);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	805 return Py_None;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	806 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	807 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	808
46178 e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	809 PyObject* pysqlite_connection_set_progress_handler(pysqlite_Connection* self, PyObject* args, PyObject* kwargs)
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	810 {
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	811 PyObject* progress_handler;
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	812 int n;
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	813
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	814 static char *kwlist[] = { "progress_handler", "n", NULL };
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	815
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	816 if (!PyArg_ParseTupleAndKeywords(args, kwargs, "Oi:set_progress_handler",
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	817 kwlist, &progress_handler, &n)) {
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	818 return NULL;
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	819 }
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	820
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	821 if (progress_handler == Py_None) {
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	822 /* None clears the progress handler previously set */
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	823 sqlite3_progress_handler(self->db, 0, 0, (void*)0);
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	824 } else {
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	825 sqlite3_progress_handler(self->db, n, _progress_handler, progress_handler);
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	826 PyDict_SetItem(self->function_pinboard, progress_handler, Py_None);
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	827 }
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	828
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	829 Py_INCREF(Py_None);
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	830 return Py_None;
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	831 }
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	832
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	833 int pysqlite_check_thread(pysqlite_Connection* self)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	834 {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	835 if (self->check_same_thread) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	836 if (PyThread_get_thread_ident() != self->thread_ident) {
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	837 PyErr_Format(pysqlite_ProgrammingError,
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	838 "SQLite objects created in a thread can only be used in that same thread."
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	839 "The object was created in thread id %ld and this is thread id %ld",
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	840 self->thread_ident, PyThread_get_thread_ident());
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	841 return 0;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	842 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	843
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	844 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	845
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	846 return 1;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	847 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	848
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	849 static PyObject* pysqlite_connection_get_isolation_level(pysqlite_Connection* self, void* unused)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	850 {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	851 Py_INCREF(self->isolation_level);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	852 return self->isolation_level;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	853 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	854
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	855 static PyObject* pysqlite_connection_get_total_changes(pysqlite_Connection* self, void* unused)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	856 {
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	857 if (!pysqlite_check_connection(self)) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	858 return NULL;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	859 } else {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	860 return Py_BuildValue("i", sqlite3_total_changes(self->db));
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	861 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	862 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	863
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	864 static int pysqlite_connection_set_isolation_level(pysqlite_Connection* self, PyObject* isolation_level)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	865 {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	866 PyObject* res;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	867 PyObject* begin_statement;
44018 a7c18b924236 #1480: fix refleak in the sqlite module. Georg Brandl <georg@python.org> parents: 43777 diff changeset	868 static PyObject* begin_word;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	869
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	870 Py_XDECREF(self->isolation_level);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	871
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	872 if (self->begin_statement) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	873 PyMem_Free(self->begin_statement);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	874 self->begin_statement = NULL;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	875 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	876
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	877 if (isolation_level == Py_None) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	878 Py_INCREF(Py_None);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	879 self->isolation_level = Py_None;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	880
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	881 res = pysqlite_connection_commit(self, NULL);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	882 if (!res) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	883 return -1;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	884 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	885 Py_DECREF(res);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	886
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	887 self->inTransaction = 0;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	888 } else {
43694 b102b8361d5e Use unicode in more places. Fixes a problem with str8 + str in test. Neal Norwitz <nnorwitz@gmail.com> parents: 43490 diff changeset	889 const char *statement;
b102b8361d5e Use unicode in more places. Fixes a problem with str8 + str in test. Neal Norwitz <nnorwitz@gmail.com> parents: 43490 diff changeset	890 Py_ssize_t size;
b102b8361d5e Use unicode in more places. Fixes a problem with str8 + str in test. Neal Norwitz <nnorwitz@gmail.com> parents: 43490 diff changeset	891
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	892 Py_INCREF(isolation_level);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	893 self->isolation_level = isolation_level;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	894
44018 a7c18b924236 #1480: fix refleak in the sqlite module. Georg Brandl <georg@python.org> parents: 43777 diff changeset	895 if (!begin_word) {
a7c18b924236 #1480: fix refleak in the sqlite module. Georg Brandl <georg@python.org> parents: 43777 diff changeset	896 begin_word = PyUnicode_FromString("BEGIN ");
a7c18b924236 #1480: fix refleak in the sqlite module. Georg Brandl <georg@python.org> parents: 43777 diff changeset	897 if (!begin_word) return -1;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	898 }
44018 a7c18b924236 #1480: fix refleak in the sqlite module. Georg Brandl <georg@python.org> parents: 43777 diff changeset	899 begin_statement = PyUnicode_Concat(begin_word, isolation_level);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	900 if (!begin_statement) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	901 return -1;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	902 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	903
48660 85b67fb5672b Rename PyUnicode_AsString -> _PyUnicode_AsString and Marc-André Lemburg <mal@egenix.com> parents: 48563 diff changeset	904 statement = _PyUnicode_AsStringAndSize(begin_statement, &size);
48563 b51cd5d3795c Merged revisions 65012,65035,65037-65040,65048,65057,65077,65091-65095,65097-65099,65127-65128,65131,65133-65136,65139,65149-65151,65155,65158-65159,65176-65178,65183-65184,65187-65190,65192,65194 via svnmerge from Georg Brandl <georg@python.org> parents: 48463 diff changeset	905 if (!statement) {
b51cd5d3795c Merged revisions 65012,65035,65037-65040,65048,65057,65077,65091-65095,65097-65099,65127-65128,65131,65133-65136,65139,65149-65151,65155,65158-65159,65176-65178,65183-65184,65187-65190,65192,65194 via svnmerge from Georg Brandl <georg@python.org> parents: 48463 diff changeset	906 Py_DECREF(statement);
b51cd5d3795c Merged revisions 65012,65035,65037-65040,65048,65057,65077,65091-65095,65097-65099,65127-65128,65131,65133-65136,65139,65149-65151,65155,65158-65159,65176-65178,65183-65184,65187-65190,65192,65194 via svnmerge from Georg Brandl <georg@python.org> parents: 48463 diff changeset	907 return -1;
b51cd5d3795c Merged revisions 65012,65035,65037-65040,65048,65057,65077,65091-65095,65097-65099,65127-65128,65131,65133-65136,65139,65149-65151,65155,65158-65159,65176-65178,65183-65184,65187-65190,65192,65194 via svnmerge from Georg Brandl <georg@python.org> parents: 48463 diff changeset	908 }
43694 b102b8361d5e Use unicode in more places. Fixes a problem with str8 + str in test. Neal Norwitz <nnorwitz@gmail.com> parents: 43490 diff changeset	909 self->begin_statement = PyMem_Malloc(size + 2);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	910 if (!self->begin_statement) {
48563 b51cd5d3795c Merged revisions 65012,65035,65037-65040,65048,65057,65077,65091-65095,65097-65099,65127-65128,65131,65133-65136,65139,65149-65151,65155,65158-65159,65176-65178,65183-65184,65187-65190,65192,65194 via svnmerge from Georg Brandl <georg@python.org> parents: 48463 diff changeset	911 Py_DECREF(begin_statement);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	912 return -1;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	913 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	914
43694 b102b8361d5e Use unicode in more places. Fixes a problem with str8 + str in test. Neal Norwitz <nnorwitz@gmail.com> parents: 43490 diff changeset	915 strcpy(self->begin_statement, statement);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	916 Py_DECREF(begin_statement);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	917 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	918
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	919 return 0;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	920 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	921
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	922 PyObject* pysqlite_connection_call(pysqlite_Connection* self, PyObject* args, PyObject* kwargs)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	923 {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	924 PyObject* sql;
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	925 pysqlite_Statement* statement;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	926 PyObject* weakref;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	927 int rc;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	928
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	929 if (!PyArg_ParseTuple(args, "O", &sql)) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	930 return NULL;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	931 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	932
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	933 _pysqlite_drop_unused_statement_references(self);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	934
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	935 statement = PyObject_New(pysqlite_Statement, &pysqlite_StatementType);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	936 if (!statement) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	937 return NULL;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	938 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	939
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	940 rc = pysqlite_statement_create(statement, self, sql);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	941
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	942 if (rc != SQLITE_OK) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	943 if (rc == PYSQLITE_TOO_MUCH_SQL) {
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	944 PyErr_SetString(pysqlite_Warning, "You can only execute one statement at a time.");
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	945 } else if (rc == PYSQLITE_SQL_WRONG_TYPE) {
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	946 PyErr_SetString(pysqlite_Warning, "SQL is of wrong type. Must be string or unicode.");
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	947 } else {
46178 e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	948 (void)pysqlite_statement_reset(statement);
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	949 _pysqlite_seterror(self->db, NULL);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	950 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	951
48463 81e34d7e4ba0 Forward port r64930. Alexandre Vassalotti <alexandre@peadrop.com> parents: 47301 diff changeset	952 Py_CLEAR(statement);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	953 } else {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	954 weakref = PyWeakref_NewRef((PyObject*)statement, NULL);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	955 if (!weakref) {
48463 81e34d7e4ba0 Forward port r64930. Alexandre Vassalotti <alexandre@peadrop.com> parents: 47301 diff changeset	956 Py_CLEAR(statement);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	957 goto error;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	958 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	959
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	960 if (PyList_Append(self->statements, weakref) != 0) {
48463 81e34d7e4ba0 Forward port r64930. Alexandre Vassalotti <alexandre@peadrop.com> parents: 47301 diff changeset	961 Py_CLEAR(weakref);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	962 goto error;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	963 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	964
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	965 Py_DECREF(weakref);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	966 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	967
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	968 error:
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	969 return (PyObject*)statement;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	970 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	971
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	972 PyObject* pysqlite_connection_execute(pysqlite_Connection* self, PyObject* args, PyObject* kwargs)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	973 {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	974 PyObject* cursor = 0;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	975 PyObject* result = 0;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	976 PyObject* method = 0;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	977
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	978 cursor = PyObject_CallMethod((PyObject*)self, "cursor", "");
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	979 if (!cursor) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	980 goto error;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	981 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	982
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	983 method = PyObject_GetAttrString(cursor, "execute");
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	984 if (!method) {
48463 81e34d7e4ba0 Forward port r64930. Alexandre Vassalotti <alexandre@peadrop.com> parents: 47301 diff changeset	985 Py_CLEAR(cursor);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	986 goto error;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	987 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	988
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	989 result = PyObject_CallObject(method, args);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	990 if (!result) {
48463 81e34d7e4ba0 Forward port r64930. Alexandre Vassalotti <alexandre@peadrop.com> parents: 47301 diff changeset	991 Py_CLEAR(cursor);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	992 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	993
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	994 error:
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	995 Py_XDECREF(result);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	996 Py_XDECREF(method);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	997
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	998 return cursor;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	999 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1000
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1001 PyObject* pysqlite_connection_executemany(pysqlite_Connection* self, PyObject* args, PyObject* kwargs)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1002 {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1003 PyObject* cursor = 0;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1004 PyObject* result = 0;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1005 PyObject* method = 0;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1006
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1007 cursor = PyObject_CallMethod((PyObject*)self, "cursor", "");
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1008 if (!cursor) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1009 goto error;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1010 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1011
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1012 method = PyObject_GetAttrString(cursor, "executemany");
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1013 if (!method) {
48463 81e34d7e4ba0 Forward port r64930. Alexandre Vassalotti <alexandre@peadrop.com> parents: 47301 diff changeset	1014 Py_CLEAR(cursor);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1015 goto error;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1016 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1017
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1018 result = PyObject_CallObject(method, args);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1019 if (!result) {
48463 81e34d7e4ba0 Forward port r64930. Alexandre Vassalotti <alexandre@peadrop.com> parents: 47301 diff changeset	1020 Py_CLEAR(cursor);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1021 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1022
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1023 error:
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1024 Py_XDECREF(result);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1025 Py_XDECREF(method);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1026
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1027 return cursor;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1028 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1029
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1030 PyObject* pysqlite_connection_executescript(pysqlite_Connection* self, PyObject* args, PyObject* kwargs)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1031 {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1032 PyObject* cursor = 0;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1033 PyObject* result = 0;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1034 PyObject* method = 0;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1035
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1036 cursor = PyObject_CallMethod((PyObject*)self, "cursor", "");
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1037 if (!cursor) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1038 goto error;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1039 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1040
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1041 method = PyObject_GetAttrString(cursor, "executescript");
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1042 if (!method) {
48463 81e34d7e4ba0 Forward port r64930. Alexandre Vassalotti <alexandre@peadrop.com> parents: 47301 diff changeset	1043 Py_CLEAR(cursor);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1044 goto error;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1045 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1046
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1047 result = PyObject_CallObject(method, args);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1048 if (!result) {
48463 81e34d7e4ba0 Forward port r64930. Alexandre Vassalotti <alexandre@peadrop.com> parents: 47301 diff changeset	1049 Py_CLEAR(cursor);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1050 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1051
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1052 error:
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1053 Py_XDECREF(result);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1054 Py_XDECREF(method);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1055
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1056 return cursor;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1057 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1058
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1059 /* ------------------------- COLLATION CODE ------------------------ */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1060
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1061 static int
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1062 pysqlite_collation_callback(
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1063 void* context,
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1064 int text1_length, const void* text1_data,
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1065 int text2_length, const void* text2_data)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1066 {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1067 PyObject* callback = (PyObject*)context;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1068 PyObject* string1 = 0;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1069 PyObject* string2 = 0;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1070 PyGILState_STATE gilstate;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1071
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1072 PyObject* retval = NULL;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1073 int result = 0;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1074
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1075 gilstate = PyGILState_Ensure();
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1076
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1077 if (PyErr_Occurred()) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1078 goto finally;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1079 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1080
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43694 diff changeset	1081 string1 = PyUnicode_FromStringAndSize((const char*)text1_data, text1_length);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43694 diff changeset	1082 string2 = PyUnicode_FromStringAndSize((const char*)text2_data, text2_length);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1083
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1084 if (!string1 \|\| !string2) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1085 goto finally; /* failed to allocate strings */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1086 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1087
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1088 retval = PyObject_CallFunctionObjArgs(callback, string1, string2, NULL);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1089
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1090 if (!retval) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1091 /* execution failed */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1092 goto finally;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1093 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1094
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 44018 diff changeset	1095 result = PyLong_AsLong(retval);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1096 if (PyErr_Occurred()) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1097 result = 0;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1098 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1099
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1100 finally:
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1101 Py_XDECREF(string1);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1102 Py_XDECREF(string2);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1103 Py_XDECREF(retval);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1104
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1105 PyGILState_Release(gilstate);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1106
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1107 return result;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1108 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1109
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1110 static PyObject *
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1111 pysqlite_connection_interrupt(pysqlite_Connection* self, PyObject* args)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1112 {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1113 PyObject* retval = NULL;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1114
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1115 if (!pysqlite_check_connection(self)) {
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1116 goto finally;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1117 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1118
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1119 sqlite3_interrupt(self->db);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1120
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1121 Py_INCREF(Py_None);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1122 retval = Py_None;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1123
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1124 finally:
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1125 return retval;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1126 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1127
46161 848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1128 /* Function author: Paul Kippes <kippesp@gmail.com>
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1129 * Class method of Connection to call the Python function _iterdump
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1130 * of the sqlite3 module.
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1131 */
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1132 static PyObject *
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1133 pysqlite_connection_iterdump(pysqlite_Connection* self, PyObject* args)
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1134 {
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1135 PyObject* retval = NULL;
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1136 PyObject* module = NULL;
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1137 PyObject* module_dict;
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1138 PyObject* pyfn_iterdump;
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1139
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1140 if (!pysqlite_check_connection(self)) {
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1141 goto finally;
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1142 }
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1143
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1144 module = PyImport_ImportModule(MODULE_NAME ".dump");
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1145 if (!module) {
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1146 goto finally;
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1147 }
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1148
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1149 module_dict = PyModule_GetDict(module);
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1150 if (!module_dict) {
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1151 goto finally;
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1152 }
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1153
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1154 pyfn_iterdump = PyDict_GetItemString(module_dict, "_iterdump");
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1155 if (!pyfn_iterdump) {
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1156 PyErr_SetString(pysqlite_OperationalError, "Failed to obtain _iterdump() reference");
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1157 goto finally;
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1158 }
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1159
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1160 args = PyTuple_New(1);
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1161 if (!args) {
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1162 goto finally;
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1163 }
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1164 Py_INCREF(self);
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1165 PyTuple_SetItem(args, 0, (PyObject*)self);
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1166 retval = PyObject_CallObject(pyfn_iterdump, args);
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1167
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1168 finally:
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1169 Py_XDECREF(args);
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1170 Py_XDECREF(module);
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1171 return retval;
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1172 }
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1173
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1174 static PyObject *
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1175 pysqlite_connection_create_collation(pysqlite_Connection* self, PyObject* args)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1176 {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1177 PyObject* callable;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1178 PyObject* uppercase_name = 0;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1179 PyObject* name;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1180 PyObject* retval;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1181 char* chk;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1182 int rc;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1183
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1184 if (!pysqlite_check_thread(self) \|\| !pysqlite_check_connection(self)) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1185 goto finally;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1186 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1187
42525 e64286053b25 Make the sqlite tests pass. Gerhard Häring <gh@ghaering.de> parents: 42334 diff changeset	1188 if (!PyArg_ParseTuple(args, "O!O:create_collation(name, callback)", &PyUnicode_Type, &name, &callable)) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1189 goto finally;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1190 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1191
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1192 uppercase_name = PyObject_CallMethod(name, "upper", "");
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1193 if (!uppercase_name) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1194 goto finally;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1195 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1196
48660 85b67fb5672b Rename PyUnicode_AsString -> _PyUnicode_AsString and Marc-André Lemburg <mal@egenix.com> parents: 48563 diff changeset	1197 chk = _PyUnicode_AsString(uppercase_name);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1198 while (*chk) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1199 if ((chk >= '0' && chk <= '9')
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1200 \|\| (chk >= 'A' && chk <= 'Z')
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1201 \|\| (*chk == '_'))
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1202 {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1203 chk++;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1204 } else {
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1205 PyErr_SetString(pysqlite_ProgrammingError, "invalid character in collation name");
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1206 goto finally;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1207 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1208 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1209
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1210 if (callable != Py_None && !PyCallable_Check(callable)) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1211 PyErr_SetString(PyExc_TypeError, "parameter must be callable");
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1212 goto finally;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1213 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1214
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1215 if (callable != Py_None) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1216 PyDict_SetItem(self->collations, uppercase_name, callable);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1217 } else {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1218 PyDict_DelItem(self->collations, uppercase_name);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1219 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1220
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1221 rc = sqlite3_create_collation(self->db,
48660 85b67fb5672b Rename PyUnicode_AsString -> _PyUnicode_AsString and Marc-André Lemburg <mal@egenix.com> parents: 48563 diff changeset	1222 _PyUnicode_AsString(uppercase_name),
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1223 SQLITE_UTF8,
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1224 (callable != Py_None) ? callable : NULL,
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1225 (callable != Py_None) ? pysqlite_collation_callback : NULL);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1226 if (rc != SQLITE_OK) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1227 PyDict_DelItem(self->collations, uppercase_name);
46178 e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	1228 _pysqlite_seterror(self->db, NULL);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1229 goto finally;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1230 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1231
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1232 finally:
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1233 Py_XDECREF(uppercase_name);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1234
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1235 if (PyErr_Occurred()) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1236 retval = NULL;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1237 } else {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1238 Py_INCREF(Py_None);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1239 retval = Py_None;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1240 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1241
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1242 return retval;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1243 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1244
46161 848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1245 /* Called when the connection is used as a context manager. Returns itself as a
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1246 * convenience to the caller. */
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1247 static PyObject *
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1248 pysqlite_connection_enter(pysqlite_Connection* self, PyObject* args)
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1249 {
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1250 Py_INCREF(self);
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1251 return (PyObject*)self;
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1252 }
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1253
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1254 /** Called when the connection is used as a context manager. If there was any
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1255 * exception, a rollback takes place; otherwise we commit. */
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1256 static PyObject *
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1257 pysqlite_connection_exit(pysqlite_Connection* self, PyObject* args)
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1258 {
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1259 PyObject* exc_type, exc_value, exc_tb;
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1260 char* method_name;
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1261 PyObject* result;
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1262
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1263 if (!PyArg_ParseTuple(args, "OOO", &exc_type, &exc_value, &exc_tb)) {
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1264 return NULL;
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1265 }
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1266
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1267 if (exc_type == Py_None && exc_value == Py_None && exc_tb == Py_None) {
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1268 method_name = "commit";
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1269 } else {
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1270 method_name = "rollback";
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1271 }
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1272
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1273 result = PyObject_CallMethod((PyObject*)self, method_name, "");
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1274 if (!result) {
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1275 return NULL;
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1276 }
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1277 Py_DECREF(result);
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1278
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1279 Py_RETURN_FALSE;
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1280 }
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1281
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1282 static char connection_doc[] =
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1283 PyDoc_STR("SQLite database connection object.");
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1284
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1285 static PyGetSetDef connection_getset[] = {
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1286 {"isolation_level", (getter)pysqlite_connection_get_isolation_level, (setter)pysqlite_connection_set_isolation_level},
47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1287 {"total_changes", (getter)pysqlite_connection_get_total_changes, (setter)0},
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1288 {NULL}
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1289 };
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1290
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1291 static PyMethodDef connection_methods[] = {
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1292 {"cursor", (PyCFunction)pysqlite_connection_cursor, METH_VARARGS\|METH_KEYWORDS,
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1293 PyDoc_STR("Return a cursor for the connection.")},
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1294 {"close", (PyCFunction)pysqlite_connection_close, METH_NOARGS,
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1295 PyDoc_STR("Closes the connection.")},
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1296 {"commit", (PyCFunction)pysqlite_connection_commit, METH_NOARGS,
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1297 PyDoc_STR("Commit the current transaction.")},
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1298 {"rollback", (PyCFunction)pysqlite_connection_rollback, METH_NOARGS,
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1299 PyDoc_STR("Roll back the current transaction.")},
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1300 {"create_function", (PyCFunction)pysqlite_connection_create_function, METH_VARARGS\|METH_KEYWORDS,
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1301 PyDoc_STR("Creates a new function. Non-standard.")},
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1302 {"create_aggregate", (PyCFunction)pysqlite_connection_create_aggregate, METH_VARARGS\|METH_KEYWORDS,
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1303 PyDoc_STR("Creates a new aggregate. Non-standard.")},
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1304 {"set_authorizer", (PyCFunction)pysqlite_connection_set_authorizer, METH_VARARGS\|METH_KEYWORDS,
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1305 PyDoc_STR("Sets authorizer callback. Non-standard.")},
46178 e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	1306 {"set_progress_handler", (PyCFunction)pysqlite_connection_set_progress_handler, METH_VARARGS\|METH_KEYWORDS,
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 46161 diff changeset	1307 PyDoc_STR("Sets progress handler callback. Non-standard.")},
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1308 {"execute", (PyCFunction)pysqlite_connection_execute, METH_VARARGS,
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1309 PyDoc_STR("Executes a SQL statement. Non-standard.")},
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1310 {"executemany", (PyCFunction)pysqlite_connection_executemany, METH_VARARGS,
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1311 PyDoc_STR("Repeatedly executes a SQL statement. Non-standard.")},
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1312 {"executescript", (PyCFunction)pysqlite_connection_executescript, METH_VARARGS,
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1313 PyDoc_STR("Executes a multiple SQL statements at once. Non-standard.")},
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1314 {"create_collation", (PyCFunction)pysqlite_connection_create_collation, METH_VARARGS,
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1315 PyDoc_STR("Creates a collation function. Non-standard.")},
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1316 {"interrupt", (PyCFunction)pysqlite_connection_interrupt, METH_NOARGS,
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1317 PyDoc_STR("Abort any pending database operation. Non-standard.")},
46161 848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1318 {"iterdump", (PyCFunction)pysqlite_connection_iterdump, METH_NOARGS,
49178 8f886acaa142 Merged revisions 66394,66404,66412,66414,66424-66436 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	1319 PyDoc_STR("Returns iterator to the dump of the database in an SQL text format. Non-standard.")},
46161 848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1320 {"__enter__", (PyCFunction)pysqlite_connection_enter, METH_NOARGS,
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1321 PyDoc_STR("For context manager. Non-standard.")},
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1322 {"__exit__", (PyCFunction)pysqlite_connection_exit, METH_VARARGS,
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1323 PyDoc_STR("For context manager. Non-standard.")},
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1324 {NULL, NULL}
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1325 };
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1326
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1327 static struct PyMemberDef connection_members[] =
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1328 {
42541 d1855d0e4e03 A few sqlite files were still using RO instead of READONLY. Guido van Rossum <guido@python.org> parents: 42526 diff changeset	1329 {"Warning", T_OBJECT, offsetof(pysqlite_Connection, Warning), READONLY},
d1855d0e4e03 A few sqlite files were still using RO instead of READONLY. Guido van Rossum <guido@python.org> parents: 42526 diff changeset	1330 {"Error", T_OBJECT, offsetof(pysqlite_Connection, Error), READONLY},
d1855d0e4e03 A few sqlite files were still using RO instead of READONLY. Guido van Rossum <guido@python.org> parents: 42526 diff changeset	1331 {"InterfaceError", T_OBJECT, offsetof(pysqlite_Connection, InterfaceError), READONLY},
d1855d0e4e03 A few sqlite files were still using RO instead of READONLY. Guido van Rossum <guido@python.org> parents: 42526 diff changeset	1332 {"DatabaseError", T_OBJECT, offsetof(pysqlite_Connection, DatabaseError), READONLY},
d1855d0e4e03 A few sqlite files were still using RO instead of READONLY. Guido van Rossum <guido@python.org> parents: 42526 diff changeset	1333 {"DataError", T_OBJECT, offsetof(pysqlite_Connection, DataError), READONLY},
d1855d0e4e03 A few sqlite files were still using RO instead of READONLY. Guido van Rossum <guido@python.org> parents: 42526 diff changeset	1334 {"OperationalError", T_OBJECT, offsetof(pysqlite_Connection, OperationalError), READONLY},
d1855d0e4e03 A few sqlite files were still using RO instead of READONLY. Guido van Rossum <guido@python.org> parents: 42526 diff changeset	1335 {"IntegrityError", T_OBJECT, offsetof(pysqlite_Connection, IntegrityError), READONLY},
d1855d0e4e03 A few sqlite files were still using RO instead of READONLY. Guido van Rossum <guido@python.org> parents: 42526 diff changeset	1336 {"InternalError", T_OBJECT, offsetof(pysqlite_Connection, InternalError), READONLY},
d1855d0e4e03 A few sqlite files were still using RO instead of READONLY. Guido van Rossum <guido@python.org> parents: 42526 diff changeset	1337 {"ProgrammingError", T_OBJECT, offsetof(pysqlite_Connection, ProgrammingError), READONLY},
d1855d0e4e03 A few sqlite files were still using RO instead of READONLY. Guido van Rossum <guido@python.org> parents: 42526 diff changeset	1338 {"NotSupportedError", T_OBJECT, offsetof(pysqlite_Connection, NotSupportedError), READONLY},
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1339 {"row_factory", T_OBJECT, offsetof(pysqlite_Connection, row_factory)},
47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1340 {"text_factory", T_OBJECT, offsetof(pysqlite_Connection, text_factory)},
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1341 {NULL}
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1342 };
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1343
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1344 PyTypeObject pysqlite_ConnectionType = {
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 40643 diff changeset	1345 PyVarObject_HEAD_INIT(NULL, 0)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1346 MODULE_NAME ".Connection", /* tp_name */
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1347 sizeof(pysqlite_Connection), /* tp_basicsize */
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1348 0, /* tp_itemsize */
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1349 (destructor)pysqlite_connection_dealloc, /* tp_dealloc */
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1350 0, /* tp_print */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1351 0, /* tp_getattr */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1352 0, /* tp_setattr */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1353 0, /* tp_compare */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1354 0, /* tp_repr */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1355 0, /* tp_as_number */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1356 0, /* tp_as_sequence */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1357 0, /* tp_as_mapping */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1358 0, /* tp_hash */
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1359 (ternaryfunc)pysqlite_connection_call, /* tp_call */
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1360 0, /* tp_str */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1361 0, /* tp_getattro */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1362 0, /* tp_setattro */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1363 0, /* tp_as_buffer */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1364 Py_TPFLAGS_DEFAULT\|Py_TPFLAGS_BASETYPE, /* tp_flags */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1365 connection_doc, /* tp_doc */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1366 0, /* tp_traverse */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1367 0, /* tp_clear */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1368 0, /* tp_richcompare */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1369 0, /* tp_weaklistoffset */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1370 0, /* tp_iter */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1371 0, /* tp_iternext */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1372 connection_methods, /* tp_methods */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1373 connection_members, /* tp_members */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1374 connection_getset, /* tp_getset */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1375 0, /* tp_base */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1376 0, /* tp_dict */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1377 0, /* tp_descr_get */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1378 0, /* tp_descr_set */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1379 0, /* tp_dictoffset */
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1380 (initproc)pysqlite_connection_init, /* tp_init */
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1381 0, /* tp_alloc */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1382 0, /* tp_new */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1383 0 /* tp_free */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1384 };
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1385
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1386 extern int pysqlite_connection_setup_types(void)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1387 {
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1388 pysqlite_ConnectionType.tp_new = PyType_GenericNew;
47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1389 return PyType_Ready(&pysqlite_ConnectionType);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	1390 }

Mercurial > cpython-lru_cache-weakref

annotate Modules/_sqlite/connection.c @ 49961:e793fc3c8abe