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

annotate Modules/_sqlite/connection.c @ 37829:f048116aade0 legacy-trunk

It's probably a good idea to actually *install* setuptools, too. ;)

author	Phillip J. Eby <pje@telecommunity.com>
date	Tue, 18 Apr 2006 04:34:50 +0000
parents	b7a3972e9915
children	7da4af95ebad

rev	line source
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1 /* connection.c - the connection type
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	2 *
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	3 * Copyright (C) 2004-2006 Gerhard Häring <gh@ghaering.de>
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	4 *
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	5 * This file is part of pysqlite.
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	6 *
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	7 * This software is provided 'as-is', without any express or implied
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	8 * warranty. In no event will the authors be held liable for any damages
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	9 * arising from the use of this software.
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	10 *
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	11 * Permission is granted to anyone to use this software for any purpose,
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	12 * including commercial applications, and to alter it and redistribute it
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	13 * freely, subject to the following restrictions:
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	14 *
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	15 * 1. The origin of this software must not be misrepresented; you must not
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	16 * claim that you wrote the original software. If you use this software
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	17 * in a product, an acknowledgment in the product documentation would be
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	18 * appreciated but is not required.
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	19 * 2. Altered source versions must be plainly marked as such, and must not be
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	20 * misrepresented as being the original software.
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	21 * 3. This notice may not be removed or altered from any source distribution.
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	22 */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	23
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	24 #include "cache.h"
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	25 #include "module.h"
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	26 #include "connection.h"
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	27 #include "statement.h"
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	28 #include "cursor.h"
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	29 #include "prepare_protocol.h"
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	30 #include "util.h"
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	31 #include "sqlitecompat.h"
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	32
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	33 #include "pythread.h"
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	34
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	35 static int connection_set_isolation_level(Connection* self, PyObject* isolation_level);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	36
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	37 int connection_init(Connection* self, PyObject* args, PyObject* kwargs)
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	38 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	39 static char *kwlist[] = {"database", "timeout", "detect_types", "isolation_level", "check_same_thread", "factory", "cached_statements", NULL, NULL};
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	40
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	41 char* database;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	42 int detect_types = 0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	43 PyObject* isolation_level = NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	44 PyObject* factory = NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	45 int check_same_thread = 1;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	46 int cached_statements = 100;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	47 double timeout = 5.0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	48 int rc;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	49
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	50 if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s\|diOiOi", kwlist,
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	51 &database, &timeout, &detect_types, &isolation_level, &check_same_thread, &factory, &cached_statements))
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	52 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	53 return -1;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	54 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	55
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	56 self->begin_statement = NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	57
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	58 self->statement_cache = NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	59
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	60 Py_INCREF(Py_None);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	61 self->row_factory = Py_None;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	62
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	63 Py_INCREF(&PyUnicode_Type);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	64 self->text_factory = (PyObject*)&PyUnicode_Type;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	65
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	66 Py_BEGIN_ALLOW_THREADS
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	67 rc = sqlite3_open(database, &self->db);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	68 Py_END_ALLOW_THREADS
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	69
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	70 if (rc != SQLITE_OK) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	71 _seterror(self->db);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	72 return -1;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	73 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	74
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	75 if (!isolation_level) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	76 isolation_level = PyString_FromString("");
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	77 } else {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	78 Py_INCREF(isolation_level);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	79 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	80 self->isolation_level = NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	81 connection_set_isolation_level(self, isolation_level);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	82 Py_DECREF(isolation_level);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	83
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	84 self->statement_cache = (Cache)PyObject_CallFunction((PyObject)&CacheType, "Oi", self, cached_statements);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	85 if (PyErr_Occurred()) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	86 return -1;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	87 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	88
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	89 /* By default, the Cache class INCREFs the factory in its initializer, and
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	90 * decrefs it in its deallocator method. Since this would create a circular
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	91 * reference here, we're breaking it by decrementing self, and telling the
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	92 * cache class to not decref the factory (self) in its deallocator.
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	93 */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	94 self->statement_cache->decref_factory = 0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	95 Py_DECREF(self);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	96
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	97 self->inTransaction = 0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	98 self->detect_types = detect_types;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	99 self->timeout = timeout;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	100 (void)sqlite3_busy_timeout(self->db, (int)(timeout*1000));
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	101
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	102 self->thread_ident = PyThread_get_thread_ident();
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	103 self->check_same_thread = check_same_thread;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	104
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	105 self->function_pinboard = PyDict_New();
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	106 if (!self->function_pinboard) {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	107 return -1;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	108 }
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	109
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	110 self->collations = PyDict_New();
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	111 if (!self->collations) {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	112 return -1;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	113 }
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	114
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	115 self->Warning = Warning;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	116 self->Error = Error;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	117 self->InterfaceError = InterfaceError;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	118 self->DatabaseError = DatabaseError;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	119 self->DataError = DataError;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	120 self->OperationalError = OperationalError;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	121 self->IntegrityError = IntegrityError;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	122 self->InternalError = InternalError;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	123 self->ProgrammingError = ProgrammingError;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	124 self->NotSupportedError = NotSupportedError;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	125
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	126 return 0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	127 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	128
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	129 void flush_statement_cache(Connection* self)
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	130 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	131 Node* node;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	132 Statement* statement;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	133
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	134 node = self->statement_cache->first;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	135
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	136 while (node) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	137 statement = (Statement*)(node->data);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	138 (void)statement_finalize(statement);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	139 node = node->next;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	140 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	141
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	142 Py_DECREF(self->statement_cache);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	143 self->statement_cache = (Cache)PyObject_CallFunction((PyObject)&CacheType, "O", self);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	144 Py_DECREF(self);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	145 self->statement_cache->decref_factory = 0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	146 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	147
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	148 void reset_all_statements(Connection* self)
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	149 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	150 Node* node;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	151 Statement* statement;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	152
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	153 node = self->statement_cache->first;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	154
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	155 while (node) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	156 statement = (Statement*)(node->data);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	157 (void)statement_reset(statement);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	158 node = node->next;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	159 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	160 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	161
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	162 void connection_dealloc(Connection* self)
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	163 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	164 Py_XDECREF(self->statement_cache);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	165
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	166 /* Clean up if user has not called .close() explicitly. */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	167 if (self->db) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	168 Py_BEGIN_ALLOW_THREADS
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	169 sqlite3_close(self->db);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	170 Py_END_ALLOW_THREADS
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	171 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	172
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	173 if (self->begin_statement) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	174 PyMem_Free(self->begin_statement);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	175 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	176 Py_XDECREF(self->isolation_level);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	177 Py_XDECREF(self->function_pinboard);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	178 Py_XDECREF(self->row_factory);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	179 Py_XDECREF(self->text_factory);
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	180 Py_XDECREF(self->collations);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	181
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	182 self->ob_type->tp_free((PyObject*)self);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	183 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	184
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	185 PyObject* connection_cursor(Connection* self, PyObject* args, PyObject* kwargs)
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	186 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	187 static char *kwlist[] = {"factory", NULL, NULL};
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	188 PyObject* factory = NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	189 PyObject* cursor;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	190
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	191
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	192 if (!PyArg_ParseTupleAndKeywords(args, kwargs, "\|O", kwlist,
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	193 &factory)) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	194 return NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	195 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	196
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	197 if (!check_thread(self) \|\| !check_connection(self)) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	198 return NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	199 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	200
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	201 if (factory == NULL) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	202 factory = (PyObject*)&CursorType;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	203 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	204
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	205 cursor = PyObject_CallFunction(factory, "O", self);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	206
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	207 if (cursor && self->row_factory != Py_None) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	208 Py_XDECREF(((Cursor*)cursor)->row_factory);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	209 Py_INCREF(self->row_factory);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	210 ((Cursor*)cursor)->row_factory = self->row_factory;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	211 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	212
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	213 return cursor;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	214 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	215
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	216 PyObject* connection_close(Connection* self, PyObject* args)
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	217 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	218 int rc;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	219
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	220 if (!check_thread(self)) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	221 return NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	222 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	223
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	224 flush_statement_cache(self);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	225
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	226 if (self->db) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	227 Py_BEGIN_ALLOW_THREADS
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	228 rc = sqlite3_close(self->db);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	229 Py_END_ALLOW_THREADS
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	230
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	231 if (rc != SQLITE_OK) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	232 _seterror(self->db);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	233 return NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	234 } else {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	235 self->db = NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	236 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	237 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	238
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	239 Py_INCREF(Py_None);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	240 return Py_None;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	241 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	242
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	243 /*
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	244 * Checks if a connection object is usable (i. e. not closed).
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	245 *
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	246 * 0 => error; 1 => ok
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	247 */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	248 int check_connection(Connection* con)
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	249 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	250 if (!con->db) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	251 PyErr_SetString(ProgrammingError, "Cannot operate on a closed database.");
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	252 return 0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	253 } else {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	254 return 1;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	255 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	256 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	257
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	258 PyObject* _connection_begin(Connection* self)
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	259 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	260 int rc;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	261 const char* tail;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	262 sqlite3_stmt* statement;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	263
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	264 Py_BEGIN_ALLOW_THREADS
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	265 rc = sqlite3_prepare(self->db, self->begin_statement, -1, &statement, &tail);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	266 Py_END_ALLOW_THREADS
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	267
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	268 if (rc != SQLITE_OK) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	269 _seterror(self->db);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	270 goto error;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	271 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	272
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	273 rc = _sqlite_step_with_busyhandler(statement, self);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	274 if (rc == SQLITE_DONE) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	275 self->inTransaction = 1;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	276 } else {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	277 _seterror(self->db);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	278 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	279
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	280 Py_BEGIN_ALLOW_THREADS
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	281 rc = sqlite3_finalize(statement);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	282 Py_END_ALLOW_THREADS
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	283
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	284 if (rc != SQLITE_OK && !PyErr_Occurred()) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	285 _seterror(self->db);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	286 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	287
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	288 error:
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	289 if (PyErr_Occurred()) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	290 return NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	291 } else {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	292 Py_INCREF(Py_None);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	293 return Py_None;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	294 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	295 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	296
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	297 PyObject* connection_commit(Connection* self, PyObject* args)
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	298 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	299 int rc;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	300 const char* tail;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	301 sqlite3_stmt* statement;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	302
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	303 if (!check_thread(self) \|\| !check_connection(self)) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	304 return NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	305 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	306
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	307 if (self->inTransaction) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	308 Py_BEGIN_ALLOW_THREADS
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	309 rc = sqlite3_prepare(self->db, "COMMIT", -1, &statement, &tail);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	310 Py_END_ALLOW_THREADS
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	311 if (rc != SQLITE_OK) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	312 _seterror(self->db);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	313 goto error;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	314 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	315
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	316 rc = _sqlite_step_with_busyhandler(statement, self);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	317 if (rc == SQLITE_DONE) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	318 self->inTransaction = 0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	319 } else {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	320 _seterror(self->db);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	321 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	322
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	323 Py_BEGIN_ALLOW_THREADS
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	324 rc = sqlite3_finalize(statement);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	325 Py_END_ALLOW_THREADS
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	326 if (rc != SQLITE_OK && !PyErr_Occurred()) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	327 _seterror(self->db);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	328 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	329
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	330 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	331
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	332 error:
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	333 if (PyErr_Occurred()) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	334 return NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	335 } else {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	336 Py_INCREF(Py_None);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	337 return Py_None;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	338 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	339 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	340
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	341 PyObject* connection_rollback(Connection* self, PyObject* args)
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	342 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	343 int rc;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	344 const char* tail;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	345 sqlite3_stmt* statement;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	346
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	347 if (!check_thread(self) \|\| !check_connection(self)) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	348 return NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	349 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	350
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	351 if (self->inTransaction) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	352 reset_all_statements(self);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	353
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	354 Py_BEGIN_ALLOW_THREADS
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	355 rc = sqlite3_prepare(self->db, "ROLLBACK", -1, &statement, &tail);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	356 Py_END_ALLOW_THREADS
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	357 if (rc != SQLITE_OK) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	358 _seterror(self->db);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	359 goto error;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	360 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	361
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	362 rc = _sqlite_step_with_busyhandler(statement, self);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	363 if (rc == SQLITE_DONE) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	364 self->inTransaction = 0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	365 } else {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	366 _seterror(self->db);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	367 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	368
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	369 Py_BEGIN_ALLOW_THREADS
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	370 rc = sqlite3_finalize(statement);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	371 Py_END_ALLOW_THREADS
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	372 if (rc != SQLITE_OK && !PyErr_Occurred()) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	373 _seterror(self->db);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	374 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	375
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	376 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	377
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	378 error:
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	379 if (PyErr_Occurred()) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	380 return NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	381 } else {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	382 Py_INCREF(Py_None);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	383 return Py_None;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	384 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	385 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	386
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	387 void _set_result(sqlite3_context* context, PyObject* py_val)
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	388 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	389 long longval;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	390 const char* buffer;
37387 4ab8ec9e59df Make ssize_t clean Neal Norwitz <nnorwitz@gmail.com> parents: 37362 diff changeset	391 Py_ssize_t buflen;
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	392 PyObject* stringval;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	393
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	394 if (PyErr_Occurred()) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	395 /* Errors in callbacks are ignored, and we return NULL */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	396 PyErr_Clear();
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	397 sqlite3_result_null(context);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	398 } else if (py_val == Py_None) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	399 sqlite3_result_null(context);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	400 } else if (PyInt_Check(py_val)) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	401 longval = PyInt_AsLong(py_val);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	402 /* TODO: investigate what to do with range overflows - long vs. long long */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	403 sqlite3_result_int64(context, (PY_LONG_LONG)longval);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	404 } else if (PyFloat_Check(py_val)) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	405 sqlite3_result_double(context, PyFloat_AsDouble(py_val));
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	406 } else if (PyBuffer_Check(py_val)) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	407 if (PyObject_AsCharBuffer(py_val, &buffer, &buflen) != 0) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	408 PyErr_SetString(PyExc_ValueError, "could not convert BLOB to buffer");
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	409 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	410 sqlite3_result_blob(context, buffer, buflen, SQLITE_TRANSIENT);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	411 } else if (PyString_Check(py_val)) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	412 sqlite3_result_text(context, PyString_AsString(py_val), -1, SQLITE_TRANSIENT);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	413 } else if (PyUnicode_Check(py_val)) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	414 stringval = PyUnicode_AsUTF8String(py_val);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	415 sqlite3_result_text(context, PyString_AsString(stringval), -1, SQLITE_TRANSIENT);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	416 Py_DECREF(stringval);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	417 } else {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	418 /* TODO: raise error */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	419 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	420 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	421
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	422 PyObject* _build_py_params(sqlite3_context context, int argc, sqlite3_value* argv)
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	423 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	424 PyObject* args;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	425 int i;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	426 sqlite3_value* cur_value;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	427 PyObject* cur_py_value;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	428 const char* val_str;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	429 PY_LONG_LONG val_int;
37387 4ab8ec9e59df Make ssize_t clean Neal Norwitz <nnorwitz@gmail.com> parents: 37362 diff changeset	430 Py_ssize_t buflen;
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	431 void* raw_buffer;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	432
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	433 args = PyTuple_New(argc);
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	434 if (!args) {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	435 return NULL;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	436 }
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	437
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	438 for (i = 0; i < argc; i++) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	439 cur_value = argv[i];
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	440 switch (sqlite3_value_type(argv[i])) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	441 case SQLITE_INTEGER:
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	442 val_int = sqlite3_value_int64(cur_value);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	443 cur_py_value = PyInt_FromLong((long)val_int);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	444 break;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	445 case SQLITE_FLOAT:
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	446 cur_py_value = PyFloat_FromDouble(sqlite3_value_double(cur_value));
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	447 break;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	448 case SQLITE_TEXT:
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	449 val_str = (const char*)sqlite3_value_text(cur_value);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	450 cur_py_value = PyUnicode_DecodeUTF8(val_str, strlen(val_str), NULL);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	451 /* TODO: have a way to show errors here */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	452 if (!cur_py_value) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	453 Py_INCREF(Py_None);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	454 cur_py_value = Py_None;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	455 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	456 break;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	457 case SQLITE_BLOB:
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	458 buflen = sqlite3_value_bytes(cur_value);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	459 cur_py_value = PyBuffer_New(buflen);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	460 if (!cur_py_value) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	461 /* TODO: error */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	462 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	463 if (PyObject_AsWriteBuffer(cur_py_value, &raw_buffer, &buflen)) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	464 /* TODO: error */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	465 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	466 memcpy(raw_buffer, sqlite3_value_blob(cur_value), buflen);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	467 break;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	468 case SQLITE_NULL:
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	469 default:
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	470 Py_INCREF(Py_None);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	471 cur_py_value = Py_None;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	472 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	473 PyTuple_SetItem(args, i, cur_py_value);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	474
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	475 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	476
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	477 return args;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	478 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	479
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	480 void _func_callback(sqlite3_context* context, int argc, sqlite3_value** argv)
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	481 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	482 PyObject* args;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	483 PyObject* py_func;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	484 PyObject* py_retval;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	485
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	486
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	487 PyGILState_STATE threadstate;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	488
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	489 threadstate = PyGILState_Ensure();
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	490
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	491 py_func = (PyObject*)sqlite3_user_data(context);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	492
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	493 args = _build_py_params(context, argc, argv);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	494
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	495 py_retval = PyObject_CallObject(py_func, args);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	496 Py_DECREF(args);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	497
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	498 _set_result(context, py_retval);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	499 Py_XDECREF(py_retval);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	500
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	501 PyGILState_Release(threadstate);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	502 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	503
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	504 static void _step_callback(sqlite3_context context, int argc, sqlite3_value* params)
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	505 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	506 PyObject* args;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	507 PyObject* function_result;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	508 PyObject* aggregate_class;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	509 PyObject** aggregate_instance;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	510 PyObject* stepmethod;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	511
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	512 PyGILState_STATE threadstate;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	513
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	514 threadstate = PyGILState_Ensure();
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	515
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	516 aggregate_class = (PyObject*)sqlite3_user_data(context);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	517
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	518 aggregate_instance = (PyObject*)sqlite3_aggregate_context(context, sizeof(PyObject));
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	519
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	520 if (*aggregate_instance == 0) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	521 *aggregate_instance = PyObject_CallFunction(aggregate_class, "");
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	522
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	523 if (PyErr_Occurred())
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	524 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	525 PyErr_Clear();
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	526 *aggregate_instance = 0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	527 PyGILState_Release(threadstate);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	528 return;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	529 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	530 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	531
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	532 stepmethod = PyObject_GetAttrString(*aggregate_instance, "step");
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	533 if (!stepmethod)
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	534 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	535 PyGILState_Release(threadstate);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	536 return;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	537 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	538
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	539 args = _build_py_params(context, argc, params);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	540
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	541 function_result = PyObject_CallObject(stepmethod, args);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	542 Py_DECREF(args);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	543 Py_DECREF(stepmethod);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	544
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	545 if (function_result == NULL) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	546 PyErr_Clear();
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	547 } else {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	548 Py_DECREF(function_result);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	549 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	550
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	551 PyGILState_Release(threadstate);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	552 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	553
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	554 void _final_callback(sqlite3_context* context)
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	555 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	556 PyObject* args;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	557 PyObject* function_result;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	558 PyObject** aggregate_instance;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	559 PyObject* aggregate_class;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	560 PyObject* finalizemethod;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	561
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	562 PyGILState_STATE threadstate;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	563
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	564 threadstate = PyGILState_Ensure();
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	565
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	566 aggregate_class = (PyObject*)sqlite3_user_data(context);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	567
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	568 aggregate_instance = (PyObject*)sqlite3_aggregate_context(context, sizeof(PyObject));
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	569 if (!*aggregate_instance) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	570 /* this branch is executed if there was an exception in the aggregate's
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	571 * __init__ */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	572
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	573 PyGILState_Release(threadstate);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	574 return;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	575 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	576
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	577 finalizemethod = PyObject_GetAttrString(*aggregate_instance, "finalize");
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	578
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	579 if (!finalizemethod) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	580 /*
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	581 PyErr_SetString(ProgrammingError, "finalize method missing");
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	582 goto error;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	583 */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	584 Py_INCREF(Py_None);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	585 function_result = Py_None;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	586 } else {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	587 args = PyTuple_New(0);
37517 ce4af5416d76 Fix unchecked return result from Coverity. Neal Norwitz <nnorwitz@gmail.com> parents: 37495 diff changeset	588 if (!args)
ce4af5416d76 Fix unchecked return result from Coverity. Neal Norwitz <nnorwitz@gmail.com> parents: 37495 diff changeset	589 return;
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	590 function_result = PyObject_CallObject(finalizemethod, args);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	591 Py_DECREF(args);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	592 Py_DECREF(finalizemethod);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	593 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	594
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	595 _set_result(context, function_result);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	596 Py_XDECREF(*aggregate_instance);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	597 Py_XDECREF(function_result);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	598
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	599 PyGILState_Release(threadstate);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	600 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	601
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	602
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	603 PyObject* connection_create_function(Connection* self, PyObject* args, PyObject* kwargs)
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	604 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	605 static char *kwlist[] = {"name", "narg", "func", NULL, NULL};
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	606
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	607 PyObject* func;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	608 char* name;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	609 int narg;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	610 int rc;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	611
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	612 if (!PyArg_ParseTupleAndKeywords(args, kwargs, "siO", kwlist,
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	613 &name, &narg, &func))
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	614 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	615 return NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	616 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	617
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	618 rc = sqlite3_create_function(self->db, name, narg, SQLITE_UTF8, (void*)func, _func_callback, NULL, NULL);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	619
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	620 PyDict_SetItem(self->function_pinboard, func, Py_None);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	621
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	622 Py_INCREF(Py_None);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	623 return Py_None;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	624 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	625
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	626 PyObject* connection_create_aggregate(Connection* self, PyObject* args, PyObject* kwargs)
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	627 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	628 PyObject* aggregate_class;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	629
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	630 int n_arg;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	631 char* name;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	632 static char *kwlist[] = { "name", "n_arg", "aggregate_class", NULL };
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	633 int rc;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	634
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	635 if (!PyArg_ParseTupleAndKeywords(args, kwargs, "siO:create_aggregate",
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	636 kwlist, &name, &n_arg, &aggregate_class)) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	637 return NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	638 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	639
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	640 rc = sqlite3_create_function(self->db, name, n_arg, SQLITE_UTF8, (void*)aggregate_class, 0, &_step_callback, &_final_callback);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	641 if (rc != SQLITE_OK) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	642 _seterror(self->db);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	643 return NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	644 } else {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	645 PyDict_SetItem(self->function_pinboard, aggregate_class, Py_None);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	646
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	647 Py_INCREF(Py_None);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	648 return Py_None;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	649 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	650 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	651
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	652 int check_thread(Connection* self)
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	653 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	654 if (self->check_same_thread) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	655 if (PyThread_get_thread_ident() != self->thread_ident) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	656 PyErr_Format(ProgrammingError,
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	657 "SQLite objects created in a thread can only be used in that same thread."
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	658 "The object was created in thread id %ld and this is thread id %ld",
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	659 self->thread_ident, PyThread_get_thread_ident());
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	660 return 0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	661 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	662
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	663 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	664
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	665 return 1;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	666 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	667
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	668 static PyObject* connection_get_isolation_level(Connection* self, void* unused)
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	669 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	670 Py_INCREF(self->isolation_level);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	671 return self->isolation_level;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	672 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	673
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	674 static PyObject* connection_get_total_changes(Connection* self, void* unused)
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	675 {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	676 if (!check_connection(self)) {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	677 return NULL;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	678 } else {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	679 return Py_BuildValue("i", sqlite3_total_changes(self->db));
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	680 }
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	681 }
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	682
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	683 static int connection_set_isolation_level(Connection* self, PyObject* isolation_level)
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	684 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	685 PyObject* empty;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	686 PyObject* res;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	687 PyObject* begin_statement;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	688
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	689 Py_XDECREF(self->isolation_level);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	690
37763 b7a3972e9915 Fix memory leak Neal Norwitz <nnorwitz@gmail.com> parents: 37517 diff changeset	691 if (self->begin_statement) {
b7a3972e9915 Fix memory leak Neal Norwitz <nnorwitz@gmail.com> parents: 37517 diff changeset	692 PyMem_Free(self->begin_statement);
b7a3972e9915 Fix memory leak Neal Norwitz <nnorwitz@gmail.com> parents: 37517 diff changeset	693 self->begin_statement = NULL;
b7a3972e9915 Fix memory leak Neal Norwitz <nnorwitz@gmail.com> parents: 37517 diff changeset	694 }
b7a3972e9915 Fix memory leak Neal Norwitz <nnorwitz@gmail.com> parents: 37517 diff changeset	695
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	696 if (isolation_level == Py_None) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	697 Py_INCREF(Py_None);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	698 self->isolation_level = Py_None;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	699
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	700 empty = PyTuple_New(0);
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	701 if (!empty) {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	702 return -1;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	703 }
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	704 res = connection_commit(self, empty);
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	705 if (!res) {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	706 return -1;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	707 }
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	708 Py_DECREF(empty);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	709 Py_DECREF(res);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	710
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	711 self->inTransaction = 0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	712 } else {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	713 Py_INCREF(isolation_level);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	714 self->isolation_level = isolation_level;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	715
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	716 begin_statement = PyString_FromString("BEGIN ");
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	717 if (!begin_statement) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	718 return -1;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	719 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	720 PyString_Concat(&begin_statement, isolation_level);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	721 if (!begin_statement) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	722 return -1;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	723 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	724
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	725 self->begin_statement = PyMem_Malloc(PyString_Size(begin_statement) + 2);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	726 if (!self->begin_statement) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	727 return -1;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	728 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	729
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	730 strcpy(self->begin_statement, PyString_AsString(begin_statement));
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	731 Py_DECREF(begin_statement);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	732 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	733
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	734 return 0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	735 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	736
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	737 PyObject* connection_call(Connection* self, PyObject* args, PyObject* kwargs)
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	738 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	739 PyObject* sql;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	740 Statement* statement;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	741 int rc;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	742
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	743 if (!PyArg_ParseTuple(args, "O", &sql)) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	744 return NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	745 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	746
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	747 statement = PyObject_New(Statement, &StatementType);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	748 if (!statement) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	749 return NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	750 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	751
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	752 rc = statement_create(statement, self, sql);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	753
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	754 if (rc != SQLITE_OK) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	755 if (rc == PYSQLITE_TOO_MUCH_SQL) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	756 PyErr_SetString(Warning, "You can only execute one statement at a time.");
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	757 } else if (rc == PYSQLITE_SQL_WRONG_TYPE) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	758 PyErr_SetString(Warning, "SQL is of wrong type. Must be string or unicode.");
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	759 } else {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	760 _seterror(self->db);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	761 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	762
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	763 Py_DECREF(statement);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	764 statement = 0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	765 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	766
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	767 return (PyObject*)statement;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	768 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	769
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	770 PyObject* connection_execute(Connection* self, PyObject* args, PyObject* kwargs)
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	771 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	772 PyObject* cursor = 0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	773 PyObject* result = 0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	774 PyObject* method = 0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	775
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	776 cursor = PyObject_CallMethod((PyObject*)self, "cursor", "");
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	777 if (!cursor) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	778 goto error;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	779 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	780
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	781 method = PyObject_GetAttrString(cursor, "execute");
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	782 if (!method) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	783 Py_DECREF(cursor);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	784 cursor = 0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	785 goto error;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	786 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	787
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	788 result = PyObject_CallObject(method, args);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	789 if (!result) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	790 Py_DECREF(cursor);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	791 cursor = 0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	792 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	793
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	794 error:
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	795 Py_XDECREF(result);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	796 Py_XDECREF(method);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	797
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	798 return cursor;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	799 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	800
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	801 PyObject* connection_executemany(Connection* self, PyObject* args, PyObject* kwargs)
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	802 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	803 PyObject* cursor = 0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	804 PyObject* result = 0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	805 PyObject* method = 0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	806
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	807 cursor = PyObject_CallMethod((PyObject*)self, "cursor", "");
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	808 if (!cursor) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	809 goto error;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	810 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	811
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	812 method = PyObject_GetAttrString(cursor, "executemany");
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	813 if (!method) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	814 Py_DECREF(cursor);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	815 cursor = 0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	816 goto error;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	817 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	818
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	819 result = PyObject_CallObject(method, args);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	820 if (!result) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	821 Py_DECREF(cursor);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	822 cursor = 0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	823 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	824
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	825 error:
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	826 Py_XDECREF(result);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	827 Py_XDECREF(method);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	828
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	829 return cursor;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	830 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	831
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	832 PyObject* connection_executescript(Connection* self, PyObject* args, PyObject* kwargs)
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	833 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	834 PyObject* cursor = 0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	835 PyObject* result = 0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	836 PyObject* method = 0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	837
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	838 cursor = PyObject_CallMethod((PyObject*)self, "cursor", "");
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	839 if (!cursor) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	840 goto error;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	841 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	842
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	843 method = PyObject_GetAttrString(cursor, "executescript");
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	844 if (!method) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	845 Py_DECREF(cursor);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	846 cursor = 0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	847 goto error;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	848 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	849
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	850 result = PyObject_CallObject(method, args);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	851 if (!result) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	852 Py_DECREF(cursor);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	853 cursor = 0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	854 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	855
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	856 error:
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	857 Py_XDECREF(result);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	858 Py_XDECREF(method);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	859
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	860 return cursor;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	861 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	862
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	863 /* ------------------------- COLLATION CODE ------------------------ */
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	864
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	865 static int
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	866 collation_callback(
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	867 void* context,
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	868 int text1_length, const void* text1_data,
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	869 int text2_length, const void* text2_data)
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	870 {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	871 PyObject* callback = (PyObject*)context;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	872 PyObject* string1 = 0;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	873 PyObject* string2 = 0;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	874 PyGILState_STATE gilstate;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	875
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	876 PyObject* retval = NULL;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	877 int result = 0;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	878
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	879 gilstate = PyGILState_Ensure();
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	880
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	881 if (PyErr_Occurred()) {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	882 goto finally;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	883 }
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	884
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	885 string1 = PyString_FromStringAndSize((const char*)text1_data, text1_length);
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	886 string2 = PyString_FromStringAndSize((const char*)text2_data, text2_length);
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	887
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	888 if (!string1 \|\| !string2) {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	889 goto finally; /* failed to allocate strings */
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	890 }
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	891
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	892 retval = PyObject_CallFunctionObjArgs(callback, string1, string2, NULL);
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	893
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	894 if (!retval) {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	895 /* execution failed */
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	896 goto finally;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	897 }
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	898
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	899 result = PyInt_AsLong(retval);
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	900 if (PyErr_Occurred()) {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	901 result = 0;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	902 }
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	903
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	904 finally:
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	905 Py_XDECREF(string1);
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	906 Py_XDECREF(string2);
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	907 Py_XDECREF(retval);
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	908
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	909 PyGILState_Release(gilstate);
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	910
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	911 return result;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	912 }
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	913
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	914 static PyObject *
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	915 connection_create_collation(Connection* self, PyObject* args)
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	916 {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	917 PyObject* callable;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	918 PyObject* uppercase_name = 0;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	919 PyObject* name;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	920 PyObject* retval;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	921 char* chk;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	922 int rc;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	923
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	924 if (!check_thread(self) \|\| !check_connection(self)) {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	925 goto finally;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	926 }
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	927
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	928 if (!PyArg_ParseTuple(args, "O!O:create_collation(name, callback)", &PyString_Type, &name, &callable)) {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	929 goto finally;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	930 }
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	931
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	932 uppercase_name = PyObject_CallMethod(name, "upper", "");
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	933 if (!uppercase_name) {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	934 goto finally;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	935 }
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	936
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	937 chk = PyString_AsString(uppercase_name);
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	938 while (*chk) {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	939 if ((chk >= '0' && chk <= '9')
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	940 \|\| (chk >= 'A' && chk <= 'Z')
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	941 \|\| (*chk == '_'))
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	942 {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	943 chk++;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	944 } else {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	945 PyErr_SetString(ProgrammingError, "invalid character in collation name");
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	946 goto finally;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	947 }
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	948 }
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	949
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	950 if (callable != Py_None && !PyCallable_Check(callable)) {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	951 PyErr_SetString(PyExc_TypeError, "parameter must be callable");
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	952 goto finally;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	953 }
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	954
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	955 if (callable != Py_None) {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	956 PyDict_SetItem(self->collations, uppercase_name, callable);
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	957 } else {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	958 PyDict_DelItem(self->collations, uppercase_name);
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	959 }
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	960
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	961 rc = sqlite3_create_collation(self->db,
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	962 PyString_AsString(uppercase_name),
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	963 SQLITE_UTF8,
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	964 (callable != Py_None) ? callable : NULL,
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	965 (callable != Py_None) ? collation_callback : NULL);
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	966 if (rc != SQLITE_OK) {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	967 PyDict_DelItem(self->collations, uppercase_name);
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	968 _seterror(self->db);
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	969 goto finally;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	970 }
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	971
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	972 finally:
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	973 Py_XDECREF(uppercase_name);
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	974
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	975 if (PyErr_Occurred()) {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	976 retval = NULL;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	977 } else {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	978 Py_INCREF(Py_None);
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	979 retval = Py_None;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	980 }
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	981
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	982 return retval;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	983 }
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	984
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	985 static char connection_doc[] =
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	986 PyDoc_STR("<missing docstring>");
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	987
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	988 static PyGetSetDef connection_getset[] = {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	989 {"isolation_level", (getter)connection_get_isolation_level, (setter)connection_set_isolation_level},
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	990 {"total_changes", (getter)connection_get_total_changes, (setter)0},
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	991 {NULL}
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	992 };
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	993
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	994 static PyMethodDef connection_methods[] = {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	995 {"cursor", (PyCFunction)connection_cursor, METH_VARARGS\|METH_KEYWORDS,
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	996 PyDoc_STR("Return a cursor for the connection.")},
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	997 {"close", (PyCFunction)connection_close, METH_NOARGS,
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	998 PyDoc_STR("Closes the connection.")},
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	999 {"commit", (PyCFunction)connection_commit, METH_NOARGS,
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1000 PyDoc_STR("Commit the current transaction.")},
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1001 {"rollback", (PyCFunction)connection_rollback, METH_NOARGS,
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1002 PyDoc_STR("Roll back the current transaction.")},
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1003 {"create_function", (PyCFunction)connection_create_function, METH_VARARGS\|METH_KEYWORDS,
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1004 PyDoc_STR("Creates a new function. Non-standard.")},
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1005 {"create_aggregate", (PyCFunction)connection_create_aggregate, METH_VARARGS\|METH_KEYWORDS,
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1006 PyDoc_STR("Creates a new aggregate. Non-standard.")},
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1007 {"execute", (PyCFunction)connection_execute, METH_VARARGS,
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1008 PyDoc_STR("Executes a SQL statement. Non-standard.")},
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1009 {"executemany", (PyCFunction)connection_executemany, METH_VARARGS,
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1010 PyDoc_STR("Repeatedly executes a SQL statement. Non-standard.")},
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1011 {"executescript", (PyCFunction)connection_executescript, METH_VARARGS,
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1012 PyDoc_STR("Executes a multiple SQL statements at once. Non-standard.")},
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1013 {"create_collation", (PyCFunction)connection_create_collation, METH_VARARGS,
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	1014 PyDoc_STR("Creates a collation function.")},
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1015 {NULL, NULL}
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1016 };
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1017
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1018 static struct PyMemberDef connection_members[] =
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1019 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1020 {"Warning", T_OBJECT, offsetof(Connection, Warning), RO},
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1021 {"Error", T_OBJECT, offsetof(Connection, Error), RO},
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1022 {"InterfaceError", T_OBJECT, offsetof(Connection, InterfaceError), RO},
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1023 {"DatabaseError", T_OBJECT, offsetof(Connection, DatabaseError), RO},
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1024 {"DataError", T_OBJECT, offsetof(Connection, DataError), RO},
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1025 {"OperationalError", T_OBJECT, offsetof(Connection, OperationalError), RO},
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1026 {"IntegrityError", T_OBJECT, offsetof(Connection, IntegrityError), RO},
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1027 {"InternalError", T_OBJECT, offsetof(Connection, InternalError), RO},
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1028 {"ProgrammingError", T_OBJECT, offsetof(Connection, ProgrammingError), RO},
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1029 {"NotSupportedError", T_OBJECT, offsetof(Connection, NotSupportedError), RO},
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1030 {"row_factory", T_OBJECT, offsetof(Connection, row_factory)},
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1031 {"text_factory", T_OBJECT, offsetof(Connection, text_factory)},
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1032 {NULL}
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1033 };
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1034
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1035 PyTypeObject ConnectionType = {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1036 PyObject_HEAD_INIT(NULL)
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1037 0, /* ob_size */
37495 d3969aeba777 upgrade to final version of pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37458 diff changeset	1038 MODULE_NAME ".Connection", /* tp_name */
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1039 sizeof(Connection), /* tp_basicsize */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1040 0, /* tp_itemsize */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1041 (destructor)connection_dealloc, /* tp_dealloc */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1042 0, /* tp_print */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1043 0, /* tp_getattr */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1044 0, /* tp_setattr */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1045 0, /* tp_compare */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1046 0, /* tp_repr */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1047 0, /* tp_as_number */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1048 0, /* tp_as_sequence */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1049 0, /* tp_as_mapping */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1050 0, /* tp_hash */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1051 (ternaryfunc)connection_call, /* tp_call */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1052 0, /* tp_str */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1053 0, /* tp_getattro */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1054 0, /* tp_setattro */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1055 0, /* tp_as_buffer */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1056 Py_TPFLAGS_DEFAULT\|Py_TPFLAGS_BASETYPE, /* tp_flags */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1057 connection_doc, /* tp_doc */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1058 0, /* tp_traverse */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1059 0, /* tp_clear */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1060 0, /* tp_richcompare */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1061 0, /* tp_weaklistoffset */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1062 0, /* tp_iter */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1063 0, /* tp_iternext */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1064 connection_methods, /* tp_methods */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1065 connection_members, /* tp_members */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1066 connection_getset, /* tp_getset */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1067 0, /* tp_base */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1068 0, /* tp_dict */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1069 0, /* tp_descr_get */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1070 0, /* tp_descr_set */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1071 0, /* tp_dictoffset */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1072 (initproc)connection_init, /* tp_init */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1073 0, /* tp_alloc */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1074 0, /* tp_new */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1075 0 /* tp_free */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1076 };
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1077
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1078 extern int connection_setup_types(void)
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1079 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1080 ConnectionType.tp_new = PyType_GenericNew;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1081 return PyType_Ready(&ConnectionType);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1082 }

Mercurial > cpython-lru_cache-weakref

annotate Modules/_sqlite/connection.c @ 37829:f048116aade0 legacy-trunk