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

annotate Modules/_sqlite/cursor.c @ 82251:bb5a8564e186 2.7

Issue #13153: Tkinter functions now raise TclError instead of ValueError when a unicode argument contains non-BMP character.

author	Serhiy Storchaka <storchaka@gmail.com>
date	Mon, 18 Feb 2013 13:00:08 +0200
parents	649937bb8f1c
children	44fe1f5b07e3

rev	line source
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1 /* cursor.c - the cursor type
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	2 *
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	3 * Copyright (C) 2004-2010 Gerhard Häring <gh@ghaering.de>
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	4 *
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	5 * This file is part of pysqlite.
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	6 *
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 "cursor.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 "util.h"
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	27 #include "sqlitecompat.h"
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	28
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	29 PyObject* pysqlite_cursor_iternext(pysqlite_Cursor* self);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	30
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	31 static char* errmsg_fetch_across_rollback = "Cursor needed to be reset because of commit/rollback and can no longer be fetched from.";
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	32
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	33 static pysqlite_StatementKind detect_statement_type(char* statement)
37362 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 char buf[20];
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	36 char* src;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	37 char* dst;
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 src = statement;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	40 /* skip over whitepace */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	41 while (src == '\r' \|\| src == '\n' \|\| src == ' ' \|\| src == '\t') {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	42 src++;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	43 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	44
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	45 if (*src == 0)
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	46 return STATEMENT_INVALID;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	47
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	48 dst = buf;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	49 *dst = 0;
72654 89713606b654 Issue #13099: Fix sqlite3.Cursor.lastrowid under a Turkish locale. Antoine Pitrou <solipsis@pitrou.net> parents: 68256 diff changeset	50 while (Py_ISALPHA(*src) && dst - buf < sizeof(buf) - 2) {
89713606b654 Issue #13099: Fix sqlite3.Cursor.lastrowid under a Turkish locale. Antoine Pitrou <solipsis@pitrou.net> parents: 68256 diff changeset	51 dst++ = Py_TOLOWER(src++);
37362 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
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	54 *dst = 0;
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 if (!strcmp(buf, "select")) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	57 return STATEMENT_SELECT;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	58 } else if (!strcmp(buf, "insert")) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	59 return STATEMENT_INSERT;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	60 } else if (!strcmp(buf, "update")) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	61 return STATEMENT_UPDATE;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	62 } else if (!strcmp(buf, "delete")) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	63 return STATEMENT_DELETE;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	64 } else if (!strcmp(buf, "replace")) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	65 return STATEMENT_REPLACE;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	66 } else {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	67 return STATEMENT_OTHER;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	68 }
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
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	71 static int pysqlite_cursor_init(pysqlite_Cursor* self, PyObject* args, PyObject* kwargs)
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	72 {
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	73 pysqlite_Connection* connection;
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	74
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	75 if (!PyArg_ParseTuple(args, "O!", &pysqlite_ConnectionType, &connection))
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	76 {
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	77 return -1;
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	78 }
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 Py_INCREF(connection);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	81 self->connection = connection;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	82 self->statement = NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	83 self->next_row = NULL;
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	84 self->in_weakreflist = NULL;
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	85
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	86 self->row_cast_map = PyList_New(0);
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	87 if (!self->row_cast_map) {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	88 return -1;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	89 }
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	90
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	91 Py_INCREF(Py_None);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	92 self->description = Py_None;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	93
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	94 Py_INCREF(Py_None);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	95 self->lastrowid= Py_None;
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->arraysize = 1;
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	98 self->closed = 0;
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	99 self->reset = 0;
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	100
47409 0156c336e6b3 Fixed rowcount for SELECT statements. They're -1 now (again), for better DB-API 2.0 compliance. Gerhard Häring <gh@ghaering.de> parents: 47294 diff changeset	101 self->rowcount = -1L;
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	102
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	103 Py_INCREF(Py_None);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	104 self->row_factory = Py_None;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	105
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	106 if (!pysqlite_check_thread(self->connection)) {
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	107 return -1;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	108 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	109
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	110 if (!pysqlite_connection_register_cursor(connection, (PyObject*)self)) {
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	111 return -1;
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	112 }
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	113
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	114 self->initialized = 1;
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	115
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	116 return 0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	117 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	118
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	119 static void pysqlite_cursor_dealloc(pysqlite_Cursor* self)
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	120 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	121 int rc;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	122
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	123 /* Reset the statement if the user has not closed the cursor */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	124 if (self->statement) {
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	125 rc = pysqlite_statement_reset(self->statement);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	126 Py_DECREF(self->statement);
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 Py_XDECREF(self->connection);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	130 Py_XDECREF(self->row_cast_map);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	131 Py_XDECREF(self->description);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	132 Py_XDECREF(self->lastrowid);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	133 Py_XDECREF(self->row_factory);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	134 Py_XDECREF(self->next_row);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	135
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	136 if (self->in_weakreflist != NULL) {
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	137 PyObject_ClearWeakRefs((PyObject*)self);
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	138 }
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	139
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	140 self->ob_type->tp_free((PyObject*)self);
37362 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
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	143 PyObject* _pysqlite_get_converter(PyObject* key)
38808 3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 38022 diff changeset	144 {
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 38022 diff changeset	145 PyObject* upcase_key;
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 38022 diff changeset	146 PyObject* retval;
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 38022 diff changeset	147
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 38022 diff changeset	148 upcase_key = PyObject_CallMethod(key, "upper", "");
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 38022 diff changeset	149 if (!upcase_key) {
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 38022 diff changeset	150 return NULL;
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 38022 diff changeset	151 }
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 38022 diff changeset	152
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 38022 diff changeset	153 retval = PyDict_GetItem(converters, upcase_key);
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 38022 diff changeset	154 Py_DECREF(upcase_key);
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 38022 diff changeset	155
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 38022 diff changeset	156 return retval;
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 38022 diff changeset	157 }
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 38022 diff changeset	158
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	159 int pysqlite_build_row_cast_map(pysqlite_Cursor* self)
37362 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 int i;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	162 const char* type_start = (const char*)-1;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	163 const char* pos;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	164
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	165 const char* colname;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	166 const char* decltype;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	167 PyObject* py_decltype;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	168 PyObject* converter;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	169 PyObject* key;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	170
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	171 if (!self->connection->detect_types) {
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	172 return 0;
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	173 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	174
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	175 Py_XDECREF(self->row_cast_map);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	176 self->row_cast_map = PyList_New(0);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	177
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	178 for (i = 0; i < sqlite3_column_count(self->statement->st); i++) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	179 converter = NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	180
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	181 if (self->connection->detect_types & PARSE_COLNAMES) {
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	182 colname = sqlite3_column_name(self->statement->st, i);
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37547 diff changeset	183 if (colname) {
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37547 diff changeset	184 for (pos = colname; *pos != 0; pos++) {
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37547 diff changeset	185 if (*pos == '[') {
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37547 diff changeset	186 type_start = pos + 1;
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37547 diff changeset	187 } else if (pos == ']' && type_start != (const char)-1) {
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37547 diff changeset	188 key = PyString_FromStringAndSize(type_start, pos - type_start);
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37547 diff changeset	189 if (!key) {
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37547 diff changeset	190 /* creating a string failed, but it is too complicated
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37547 diff changeset	191 * to propagate the error here, we just assume there is
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37547 diff changeset	192 * no converter and proceed */
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37547 diff changeset	193 break;
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37547 diff changeset	194 }
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	195
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	196 converter = _pysqlite_get_converter(key);
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37547 diff changeset	197 Py_DECREF(key);
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	198 break;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	199 }
37362 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 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	202 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	203
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	204 if (!converter && self->connection->detect_types & PARSE_DECLTYPES) {
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	205 decltype = sqlite3_column_decltype(self->statement->st, i);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	206 if (decltype) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	207 for (pos = decltype;;pos++) {
46659 28b099ac4cd8 Implemented feature request 2157: Converter names are cut off at '(' Gerhard Häring <gh@ghaering.de> parents: 46166 diff changeset	208 /* Converter names are split at '(' and blanks.
28b099ac4cd8 Implemented feature request 2157: Converter names are cut off at '(' Gerhard Häring <gh@ghaering.de> parents: 46166 diff changeset	209 * This allows 'INTEGER NOT NULL' to be treated as 'INTEGER' and
28b099ac4cd8 Implemented feature request 2157: Converter names are cut off at '(' Gerhard Häring <gh@ghaering.de> parents: 46166 diff changeset	210 * 'NUMBER(10)' to be treated as 'NUMBER', for example.
28b099ac4cd8 Implemented feature request 2157: Converter names are cut off at '(' Gerhard Häring <gh@ghaering.de> parents: 46166 diff changeset	211 * In other words, it will work as people expect it to work.*/
28b099ac4cd8 Implemented feature request 2157: Converter names are cut off at '(' Gerhard Häring <gh@ghaering.de> parents: 46166 diff changeset	212 if (pos == ' ' \|\| pos == '(' \|\| *pos == 0) {
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	213 py_decltype = PyString_FromStringAndSize(decltype, pos - decltype);
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	214 if (!py_decltype) {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	215 return -1;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	216 }
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	217 break;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	218 }
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
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	221 converter = _pysqlite_get_converter(py_decltype);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	222 Py_DECREF(py_decltype);
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 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	225
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	226 if (!converter) {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	227 converter = Py_None;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	228 }
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	229
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	230 if (PyList_Append(self->row_cast_map, converter) != 0) {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	231 if (converter != Py_None) {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	232 Py_DECREF(converter);
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	233 }
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	234 Py_XDECREF(self->row_cast_map);
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	235 self->row_cast_map = NULL;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	236
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	237 return -1;
37362 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 }
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	240
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	241 return 0;
37362 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
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	244 PyObject* _pysqlite_build_column_name(const char* colname)
37362 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 const char* pos;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	247
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	248 if (!colname) {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	249 Py_INCREF(Py_None);
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	250 return Py_None;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	251 }
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	252
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	253 for (pos = colname;; pos++) {
38808 3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 38022 diff changeset	254 if (pos == 0 \|\| pos == '[') {
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 38022 diff changeset	255 if ((pos == '[') && (pos > colname) && ((pos-1) == ' ')) {
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 38022 diff changeset	256 pos--;
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 38022 diff changeset	257 }
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	258 return PyString_FromStringAndSize(colname, pos - colname);
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 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	261 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	262
74709 93ac4b12a750 sqlite3: Handle strings with embedded zeros correctly Petri Lehtinen <petri@digip.org> parents: 72654 diff changeset	263 PyObject* pysqlite_unicode_from_string(const char* val_str, Py_ssize_t size, int optimize)
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	264 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	265 const char* check;
74709 93ac4b12a750 sqlite3: Handle strings with embedded zeros correctly Petri Lehtinen <petri@digip.org> parents: 72654 diff changeset	266 Py_ssize_t pos;
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	267 int is_ascii = 0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	268
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	269 if (optimize) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	270 is_ascii = 1;
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 check = val_str;
74709 93ac4b12a750 sqlite3: Handle strings with embedded zeros correctly Petri Lehtinen <petri@digip.org> parents: 72654 diff changeset	273 for (pos = 0; pos < size; pos++) {
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	274 if (*check & 0x80) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	275 is_ascii = 0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	276 break;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	277 }
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 check++;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	280 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	281 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	282
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	283 if (is_ascii) {
74709 93ac4b12a750 sqlite3: Handle strings with embedded zeros correctly Petri Lehtinen <petri@digip.org> parents: 72654 diff changeset	284 return PyString_FromStringAndSize(val_str, size);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	285 } else {
74709 93ac4b12a750 sqlite3: Handle strings with embedded zeros correctly Petri Lehtinen <petri@digip.org> parents: 72654 diff changeset	286 return PyUnicode_DecodeUTF8(val_str, size, NULL);
37362 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 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	289
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	290 /*
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	291 * Returns a row from the currently active SQLite statement
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	292 *
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	293 * Precondidition:
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	294 * - sqlite3_step() has been called before and it returned SQLITE_ROW.
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	295 */
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	296 PyObject* _pysqlite_fetch_one_row(pysqlite_Cursor* self)
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	297 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	298 int i, numcols;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	299 PyObject* row;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	300 PyObject* item = NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	301 int coltype;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	302 PyObject* converter;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	303 PyObject* converted;
37387 4ab8ec9e59df Make ssize_t clean Neal Norwitz <nnorwitz@gmail.com> parents: 37381 diff changeset	304 Py_ssize_t nbytes;
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	305 PyObject* buffer;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	306 void* raw_buffer;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	307 const char* val_str;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	308 char buf[200];
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37547 diff changeset	309 const char* colname;
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	310
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	311 if (self->reset) {
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	312 PyErr_SetString(pysqlite_InterfaceError, errmsg_fetch_across_rollback);
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	313 return NULL;
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	314 }
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	315
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	316 Py_BEGIN_ALLOW_THREADS
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	317 numcols = sqlite3_data_count(self->statement->st);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	318 Py_END_ALLOW_THREADS
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	319
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	320 row = PyTuple_New(numcols);
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	321 if (!row) {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	322 return NULL;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	323 }
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	324
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	325 for (i = 0; i < numcols; i++) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	326 if (self->connection->detect_types) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	327 converter = PyList_GetItem(self->row_cast_map, i);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	328 if (!converter) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	329 converter = Py_None;
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 } else {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	332 converter = Py_None;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	333 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	334
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	335 if (converter != Py_None) {
38978 5dd736268ff4 The sqlite3 module did cut off data from the SQLite database at the first null Gerhard Häring <gh@ghaering.de> parents: 38808 diff changeset	336 nbytes = sqlite3_column_bytes(self->statement->st, i);
5dd736268ff4 The sqlite3 module did cut off data from the SQLite database at the first null Gerhard Häring <gh@ghaering.de> parents: 38808 diff changeset	337 val_str = (const char*)sqlite3_column_blob(self->statement->st, i);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	338 if (!val_str) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	339 Py_INCREF(Py_None);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	340 converted = Py_None;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	341 } else {
38978 5dd736268ff4 The sqlite3 module did cut off data from the SQLite database at the first null Gerhard Häring <gh@ghaering.de> parents: 38808 diff changeset	342 item = PyString_FromStringAndSize(val_str, nbytes);
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	343 if (!item) {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	344 return NULL;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	345 }
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	346 converted = PyObject_CallFunction(converter, "O", item);
38808 3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 38022 diff changeset	347 Py_DECREF(item);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	348 if (!converted) {
38808 3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 38022 diff changeset	349 break;
37362 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 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	352 } else {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	353 Py_BEGIN_ALLOW_THREADS
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	354 coltype = sqlite3_column_type(self->statement->st, i);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	355 Py_END_ALLOW_THREADS
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	356 if (coltype == SQLITE_NULL) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	357 Py_INCREF(Py_None);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	358 converted = Py_None;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	359 } else if (coltype == SQLITE_INTEGER) {
82054 649937bb8f1c Issue #17073: Fix some integer overflows in sqlite3 module. Serhiy Storchaka <storchaka@gmail.com> parents: 74811 diff changeset	360 converted = _pysqlite_long_from_int64(sqlite3_column_int64(self->statement->st, i));
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	361 } else if (coltype == SQLITE_FLOAT) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	362 converted = PyFloat_FromDouble(sqlite3_column_double(self->statement->st, i));
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	363 } else if (coltype == SQLITE_TEXT) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	364 val_str = (const char*)sqlite3_column_text(self->statement->st, i);
74709 93ac4b12a750 sqlite3: Handle strings with embedded zeros correctly Petri Lehtinen <petri@digip.org> parents: 72654 diff changeset	365 nbytes = sqlite3_column_bytes(self->statement->st, i);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	366 if ((self->connection->text_factory == (PyObject*)&PyUnicode_Type)
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	367 \|\| (self->connection->text_factory == pysqlite_OptimizedUnicode)) {
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	368
74709 93ac4b12a750 sqlite3: Handle strings with embedded zeros correctly Petri Lehtinen <petri@digip.org> parents: 72654 diff changeset	369 converted = pysqlite_unicode_from_string(val_str, nbytes,
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	370 self->connection->text_factory == pysqlite_OptimizedUnicode ? 1 : 0);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	371
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	372 if (!converted) {
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37547 diff changeset	373 colname = sqlite3_column_name(self->statement->st, i);
38808 3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 38022 diff changeset	374 if (!colname) {
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37547 diff changeset	375 colname = "<unknown column name>";
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37547 diff changeset	376 }
38808 3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 38022 diff changeset	377 PyOS_snprintf(buf, sizeof(buf) - 1, "Could not decode to UTF-8 column '%s' with text '%s'",
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37547 diff changeset	378 colname , val_str);
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	379 PyErr_SetString(pysqlite_OperationalError, buf);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	380 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	381 } else if (self->connection->text_factory == (PyObject*)&PyString_Type) {
74709 93ac4b12a750 sqlite3: Handle strings with embedded zeros correctly Petri Lehtinen <petri@digip.org> parents: 72654 diff changeset	382 converted = PyString_FromStringAndSize(val_str, nbytes);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	383 } else {
74709 93ac4b12a750 sqlite3: Handle strings with embedded zeros correctly Petri Lehtinen <petri@digip.org> parents: 72654 diff changeset	384 converted = PyObject_CallFunction(self->connection->text_factory, "s#", val_str, nbytes);
37362 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 } else {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	387 /* coltype == SQLITE_BLOB */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	388 nbytes = sqlite3_column_bytes(self->statement->st, i);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	389 buffer = PyBuffer_New(nbytes);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	390 if (!buffer) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	391 break;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	392 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	393 if (PyObject_AsWriteBuffer(buffer, &raw_buffer, &nbytes)) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	394 break;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	395 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	396 memcpy(raw_buffer, sqlite3_column_blob(self->statement->st, i), nbytes);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	397 converted = buffer;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	398 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	399 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	400
38808 3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 38022 diff changeset	401 if (converted) {
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 38022 diff changeset	402 PyTuple_SetItem(row, i, converted);
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 38022 diff changeset	403 } else {
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 38022 diff changeset	404 Py_INCREF(Py_None);
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 38022 diff changeset	405 PyTuple_SetItem(row, i, Py_None);
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 38022 diff changeset	406 }
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	407 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	408
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	409 if (PyErr_Occurred()) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	410 Py_DECREF(row);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	411 row = NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	412 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	413
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	414 return row;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	415 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	416
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	417 /*
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	418 * Checks if a cursor object is usable.
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	419 *
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	420 * 0 => error; 1 => ok
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	421 */
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	422 static int check_cursor(pysqlite_Cursor* cur)
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	423 {
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	424 if (!cur->initialized) {
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	425 PyErr_SetString(pysqlite_ProgrammingError, "Base Cursor.__init__ not called.");
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	426 return 0;
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	427 }
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	428
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	429 if (cur->closed) {
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	430 PyErr_SetString(pysqlite_ProgrammingError, "Cannot operate on a closed cursor.");
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	431 return 0;
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	432 }
74811 631e99961c5f Issue #10811: Fix recursive usage of cursors. Instead of crashing, raise a ProgrammingError now. Petri Lehtinen <petri@digip.org> parents: 74709 diff changeset	433
631e99961c5f Issue #10811: Fix recursive usage of cursors. Instead of crashing, raise a ProgrammingError now. Petri Lehtinen <petri@digip.org> parents: 74709 diff changeset	434 if (cur->locked) {
631e99961c5f Issue #10811: Fix recursive usage of cursors. Instead of crashing, raise a ProgrammingError now. Petri Lehtinen <petri@digip.org> parents: 74709 diff changeset	435 PyErr_SetString(pysqlite_ProgrammingError, "Recursive use of cursors not allowed.");
631e99961c5f Issue #10811: Fix recursive usage of cursors. Instead of crashing, raise a ProgrammingError now. Petri Lehtinen <petri@digip.org> parents: 74709 diff changeset	436 return 0;
631e99961c5f Issue #10811: Fix recursive usage of cursors. Instead of crashing, raise a ProgrammingError now. Petri Lehtinen <petri@digip.org> parents: 74709 diff changeset	437 }
631e99961c5f Issue #10811: Fix recursive usage of cursors. Instead of crashing, raise a ProgrammingError now. Petri Lehtinen <petri@digip.org> parents: 74709 diff changeset	438
631e99961c5f Issue #10811: Fix recursive usage of cursors. Instead of crashing, raise a ProgrammingError now. Petri Lehtinen <petri@digip.org> parents: 74709 diff changeset	439 return pysqlite_check_thread(cur->connection) && pysqlite_check_connection(cur->connection);
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	440 }
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	441
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	442 PyObject* _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* args)
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	443 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	444 PyObject* operation;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	445 PyObject* operation_bytestr = NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	446 char* operation_cstr;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	447 PyObject* parameters_list = NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	448 PyObject* parameters_iter = NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	449 PyObject* parameters = NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	450 int i;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	451 int rc;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	452 PyObject* func_args;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	453 PyObject* result;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	454 int numcols;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	455 int statement_type;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	456 PyObject* descriptor;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	457 PyObject* second_argument = NULL;
46166 a21854e510b4 Update sqlite3 module to match current version of pysqlite. Gerhard Häring <gh@ghaering.de> parents: 45580 diff changeset	458 int allow_8bit_chars;
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	459
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	460 if (!check_cursor(self)) {
74811 631e99961c5f Issue #10811: Fix recursive usage of cursors. Instead of crashing, raise a ProgrammingError now. Petri Lehtinen <petri@digip.org> parents: 74709 diff changeset	461 goto error;
37362 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
74811 631e99961c5f Issue #10811: Fix recursive usage of cursors. Instead of crashing, raise a ProgrammingError now. Petri Lehtinen <petri@digip.org> parents: 74709 diff changeset	464 self->locked = 1;
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	465 self->reset = 0;
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	466
46166 a21854e510b4 Update sqlite3 module to match current version of pysqlite. Gerhard Häring <gh@ghaering.de> parents: 45580 diff changeset	467 /* Make shooting yourself in the foot with not utf-8 decodable 8-bit-strings harder */
a21854e510b4 Update sqlite3 module to match current version of pysqlite. Gerhard Häring <gh@ghaering.de> parents: 45580 diff changeset	468 allow_8bit_chars = ((self->connection->text_factory != (PyObject*)&PyUnicode_Type) &&
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	469 (self->connection->text_factory != pysqlite_OptimizedUnicode));
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	470
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	471 Py_XDECREF(self->next_row);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	472 self->next_row = NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	473
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	474 if (multiple) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	475 /* executemany() */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	476 if (!PyArg_ParseTuple(args, "OO", &operation, &second_argument)) {
74811 631e99961c5f Issue #10811: Fix recursive usage of cursors. Instead of crashing, raise a ProgrammingError now. Petri Lehtinen <petri@digip.org> parents: 74709 diff changeset	477 goto error;
37362 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 if (!PyString_Check(operation) && !PyUnicode_Check(operation)) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	481 PyErr_SetString(PyExc_ValueError, "operation parameter must be str or unicode");
74811 631e99961c5f Issue #10811: Fix recursive usage of cursors. Instead of crashing, raise a ProgrammingError now. Petri Lehtinen <petri@digip.org> parents: 74709 diff changeset	482 goto error;
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	483 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	484
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	485 if (PyIter_Check(second_argument)) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	486 /* iterator */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	487 Py_INCREF(second_argument);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	488 parameters_iter = second_argument;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	489 } else {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	490 /* sequence */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	491 parameters_iter = PyObject_GetIter(second_argument);
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37547 diff changeset	492 if (!parameters_iter) {
74811 631e99961c5f Issue #10811: Fix recursive usage of cursors. Instead of crashing, raise a ProgrammingError now. Petri Lehtinen <petri@digip.org> parents: 74709 diff changeset	493 goto error;
37362 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 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	496 } else {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	497 /* execute() */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	498 if (!PyArg_ParseTuple(args, "O\|O", &operation, &second_argument)) {
74811 631e99961c5f Issue #10811: Fix recursive usage of cursors. Instead of crashing, raise a ProgrammingError now. Petri Lehtinen <petri@digip.org> parents: 74709 diff changeset	499 goto error;
37362 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
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	502 if (!PyString_Check(operation) && !PyUnicode_Check(operation)) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	503 PyErr_SetString(PyExc_ValueError, "operation parameter must be str or unicode");
74811 631e99961c5f Issue #10811: Fix recursive usage of cursors. Instead of crashing, raise a ProgrammingError now. Petri Lehtinen <petri@digip.org> parents: 74709 diff changeset	504 goto error;
37362 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
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	507 parameters_list = PyList_New(0);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	508 if (!parameters_list) {
74811 631e99961c5f Issue #10811: Fix recursive usage of cursors. Instead of crashing, raise a ProgrammingError now. Petri Lehtinen <petri@digip.org> parents: 74709 diff changeset	509 goto error;
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	510 }
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 if (second_argument == NULL) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	513 second_argument = PyTuple_New(0);
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	514 if (!second_argument) {
37461 6ab15fc85c2d Fix a couple of memory issues Neal Norwitz <nnorwitz@gmail.com> parents: 37458 diff changeset	515 goto error;
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	516 }
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	517 } else {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	518 Py_INCREF(second_argument);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	519 }
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	520 if (PyList_Append(parameters_list, second_argument) != 0) {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	521 Py_DECREF(second_argument);
37461 6ab15fc85c2d Fix a couple of memory issues Neal Norwitz <nnorwitz@gmail.com> parents: 37458 diff changeset	522 goto error;
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	523 }
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	524 Py_DECREF(second_argument);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	525
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	526 parameters_iter = PyObject_GetIter(parameters_list);
37547 48311401a20e Fix problem (not checking return result) reported by Coverity Neal Norwitz <nnorwitz@gmail.com> parents: 37518 diff changeset	527 if (!parameters_iter) {
48311401a20e Fix problem (not checking return result) reported by Coverity Neal Norwitz <nnorwitz@gmail.com> parents: 37518 diff changeset	528 goto error;
48311401a20e Fix problem (not checking return result) reported by Coverity Neal Norwitz <nnorwitz@gmail.com> parents: 37518 diff changeset	529 }
37362 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 if (self->statement != NULL) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	533 /* There is an active statement */
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	534 rc = pysqlite_statement_reset(self->statement);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	535 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	536
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	537 if (PyString_Check(operation)) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	538 operation_cstr = PyString_AsString(operation);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	539 } else {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	540 operation_bytestr = PyUnicode_AsUTF8String(operation);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	541 if (!operation_bytestr) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	542 goto error;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	543 }
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 operation_cstr = PyString_AsString(operation_bytestr);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	546 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	547
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	548 /* reset description and rowcount */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	549 Py_DECREF(self->description);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	550 Py_INCREF(Py_None);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	551 self->description = Py_None;
47409 0156c336e6b3 Fixed rowcount for SELECT statements. They're -1 now (again), for better DB-API 2.0 compliance. Gerhard Häring <gh@ghaering.de> parents: 47294 diff changeset	552 self->rowcount = -1L;
37362 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 func_args = PyTuple_New(1);
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	555 if (!func_args) {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	556 goto error;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	557 }
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	558 Py_INCREF(operation);
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	559 if (PyTuple_SetItem(func_args, 0, operation) != 0) {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	560 goto error;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	561 }
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	562
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	563 if (self->statement) {
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	564 (void)pysqlite_statement_reset(self->statement);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	565 Py_DECREF(self->statement);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	566 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	567
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	568 self->statement = (pysqlite_Statement*)pysqlite_cache_get(self->connection->statement_cache, func_args);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	569 Py_DECREF(func_args);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	570
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	571 if (!self->statement) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	572 goto error;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	573 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	574
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	575 if (self->statement->in_use) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	576 Py_DECREF(self->statement);
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	577 self->statement = PyObject_New(pysqlite_Statement, &pysqlite_StatementType);
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	578 if (!self->statement) {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	579 goto error;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	580 }
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	581 rc = pysqlite_statement_create(self->statement, self->connection, operation);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	582 if (rc != SQLITE_OK) {
47951 afe8d515bfe2 Issue #3153: sqlite leaks on error. Alexandre Vassalotti <alexandre@peadrop.com> parents: 47527 diff changeset	583 Py_CLEAR(self->statement);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	584 goto error;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	585 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	586 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	587
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	588 pysqlite_statement_reset(self->statement);
b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	589 pysqlite_statement_mark_dirty(self->statement);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	590
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	591 statement_type = detect_statement_type(operation_cstr);
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	592 if (self->connection->begin_statement) {
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	593 switch (statement_type) {
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	594 case STATEMENT_UPDATE:
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	595 case STATEMENT_DELETE:
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	596 case STATEMENT_INSERT:
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	597 case STATEMENT_REPLACE:
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	598 if (!self->connection->inTransaction) {
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	599 result = _pysqlite_connection_begin(self->connection);
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	600 if (!result) {
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	601 goto error;
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	602 }
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	603 Py_DECREF(result);
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	604 }
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	605 break;
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	606 case STATEMENT_OTHER:
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	607 /* it's a DDL statement or something similar
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	608 - we better COMMIT first so it works for all cases */
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	609 if (self->connection->inTransaction) {
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	610 result = pysqlite_connection_commit(self->connection, NULL);
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	611 if (!result) {
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	612 goto error;
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	613 }
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	614 Py_DECREF(result);
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	615 }
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	616 break;
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	617 case STATEMENT_SELECT:
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	618 if (multiple) {
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	619 PyErr_SetString(pysqlite_ProgrammingError,
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	620 "You cannot execute SELECT statements in executemany().");
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	621 goto error;
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	622 }
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	623 break;
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	624 }
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	625 }
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	626
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	627 while (1) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	628 parameters = PyIter_Next(parameters_iter);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	629 if (!parameters) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	630 break;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	631 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	632
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	633 pysqlite_statement_mark_dirty(self->statement);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	634
46166 a21854e510b4 Update sqlite3 module to match current version of pysqlite. Gerhard Häring <gh@ghaering.de> parents: 45580 diff changeset	635 pysqlite_statement_bind_parameters(self->statement, parameters, allow_8bit_chars);
37381 91e9fb5cfe14 backport r243 from the pysqlite2 svn repository - lowers the required version Anthony Baxter <anthonybaxter@gmail.com> parents: 37362 diff changeset	636 if (PyErr_Occurred()) {
91e9fb5cfe14 backport r243 from the pysqlite2 svn repository - lowers the required version Anthony Baxter <anthonybaxter@gmail.com> parents: 37362 diff changeset	637 goto error;
37362 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
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	640 /* Keep trying the SQL statement until the schema stops changing. */
b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	641 while (1) {
b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	642 /* Actually execute the SQL statement. */
49154 4c77d1016f60 Fixes issue #3103. In the sqlite3 module, made one more function static. All renaming public symbos now have the pysqlite prefix to avoid name clashes. This at least once created problems where the same symbol name appeared somewhere in Apache and the sqlite3 module was used from mod_python. Gerhard Häring <gh@ghaering.de> parents: 47951 diff changeset	643 rc = pysqlite_step(self->statement->st, self->connection);
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	644 if (rc == SQLITE_DONE \|\| rc == SQLITE_ROW) {
b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	645 /* If it worked, let's get out of the loop */
b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	646 break;
b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	647 }
b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	648 /* Something went wrong. Re-set the statement and try again. */
b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	649 rc = pysqlite_statement_reset(self->statement);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	650 if (rc == SQLITE_SCHEMA) {
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	651 /* If this was a result of the schema changing, let's try
b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	652 again. */
b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	653 rc = pysqlite_statement_recompile(self->statement, parameters);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	654 if (rc == SQLITE_OK) {
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	655 continue;
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	656 } else {
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	657 /* If the database gave us an error, promote it to Python. */
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	658 (void)pysqlite_statement_reset(self->statement);
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	659 _pysqlite_seterror(self->connection->db, NULL);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	660 goto error;
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 } else {
38808 3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 38022 diff changeset	663 if (PyErr_Occurred()) {
39251 c4ac6ea497a1 Fix spelling. Georg Brandl <georg@python.org> parents: 38978 diff changeset	664 /* there was an error that occurred in a user-defined callback */
38808 3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 38022 diff changeset	665 if (_enable_callback_tracebacks) {
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 38022 diff changeset	666 PyErr_Print();
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 38022 diff changeset	667 } else {
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 38022 diff changeset	668 PyErr_Clear();
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 38022 diff changeset	669 }
3e5fd2b70e5a Merged changes from external pysqlite 2.3.0 release. Documentation updates will Gerhard Häring <gh@ghaering.de> parents: 38022 diff changeset	670 }
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	671 (void)pysqlite_statement_reset(self->statement);
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	672 _pysqlite_seterror(self->connection->db, NULL);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	673 goto error;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	674 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	675 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	676
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	677 if (pysqlite_build_row_cast_map(self) != 0) {
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	678 PyErr_SetString(pysqlite_OperationalError, "Error while building row_cast_map");
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	679 goto error;
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	680 }
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	681
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	682 if (rc == SQLITE_ROW \|\| (rc == SQLITE_DONE && statement_type == STATEMENT_SELECT)) {
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	683 if (self->description == Py_None) {
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	684 Py_BEGIN_ALLOW_THREADS
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	685 numcols = sqlite3_column_count(self->statement->st);
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	686 Py_END_ALLOW_THREADS
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	687
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	688 Py_DECREF(self->description);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	689 self->description = PyTuple_New(numcols);
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	690 if (!self->description) {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	691 goto error;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	692 }
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	693 for (i = 0; i < numcols; i++) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	694 descriptor = PyTuple_New(7);
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	695 if (!descriptor) {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	696 goto error;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	697 }
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	698 PyTuple_SetItem(descriptor, 0, _pysqlite_build_column_name(sqlite3_column_name(self->statement->st, i)));
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	699 Py_INCREF(Py_None); PyTuple_SetItem(descriptor, 1, Py_None);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	700 Py_INCREF(Py_None); PyTuple_SetItem(descriptor, 2, Py_None);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	701 Py_INCREF(Py_None); PyTuple_SetItem(descriptor, 3, Py_None);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	702 Py_INCREF(Py_None); PyTuple_SetItem(descriptor, 4, Py_None);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	703 Py_INCREF(Py_None); PyTuple_SetItem(descriptor, 5, Py_None);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	704 Py_INCREF(Py_None); PyTuple_SetItem(descriptor, 6, Py_None);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	705 PyTuple_SetItem(self->description, i, descriptor);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	706 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	707 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	708 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	709
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	710 if (rc == SQLITE_ROW) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	711 if (multiple) {
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	712 PyErr_SetString(pysqlite_ProgrammingError, "executemany() can only execute DML statements.");
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	713 goto error;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	714 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	715
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	716 self->next_row = _pysqlite_fetch_one_row(self);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	717 } else if (rc == SQLITE_DONE && !multiple) {
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	718 pysqlite_statement_reset(self->statement);
47951 afe8d515bfe2 Issue #3153: sqlite leaks on error. Alexandre Vassalotti <alexandre@peadrop.com> parents: 47527 diff changeset	719 Py_CLEAR(self->statement);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	720 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	721
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	722 switch (statement_type) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	723 case STATEMENT_UPDATE:
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	724 case STATEMENT_DELETE:
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	725 case STATEMENT_INSERT:
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	726 case STATEMENT_REPLACE:
47409 0156c336e6b3 Fixed rowcount for SELECT statements. They're -1 now (again), for better DB-API 2.0 compliance. Gerhard Häring <gh@ghaering.de> parents: 47294 diff changeset	727 if (self->rowcount == -1L) {
0156c336e6b3 Fixed rowcount for SELECT statements. They're -1 now (again), for better DB-API 2.0 compliance. Gerhard Häring <gh@ghaering.de> parents: 47294 diff changeset	728 self->rowcount = 0L;
0156c336e6b3 Fixed rowcount for SELECT statements. They're -1 now (again), for better DB-API 2.0 compliance. Gerhard Häring <gh@ghaering.de> parents: 47294 diff changeset	729 }
0156c336e6b3 Fixed rowcount for SELECT statements. They're -1 now (again), for better DB-API 2.0 compliance. Gerhard Häring <gh@ghaering.de> parents: 47294 diff changeset	730 self->rowcount += (long)sqlite3_changes(self->connection->db);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	731 }
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 Py_DECREF(self->lastrowid);
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	734 if (!multiple && statement_type == STATEMENT_INSERT) {
82054 649937bb8f1c Issue #17073: Fix some integer overflows in sqlite3 module. Serhiy Storchaka <storchaka@gmail.com> parents: 74811 diff changeset	735 sqlite3_int64 lastrowid;
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	736 Py_BEGIN_ALLOW_THREADS
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	737 lastrowid = sqlite3_last_insert_rowid(self->connection->db);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	738 Py_END_ALLOW_THREADS
82054 649937bb8f1c Issue #17073: Fix some integer overflows in sqlite3 module. Serhiy Storchaka <storchaka@gmail.com> parents: 74811 diff changeset	739 self->lastrowid = _pysqlite_long_from_int64(lastrowid);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	740 } else {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	741 Py_INCREF(Py_None);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	742 self->lastrowid = Py_None;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	743 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	744
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	745 if (multiple) {
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	746 rc = pysqlite_statement_reset(self->statement);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	747 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	748 Py_XDECREF(parameters);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	749 }
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 error:
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	752 /* just to be sure (implicit ROLLBACKs with ON CONFLICT ROLLBACK/OR
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	753 * ROLLBACK could have happened */
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	754 #ifdef SQLITE_VERSION_NUMBER
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	755 #if SQLITE_VERSION_NUMBER >= 3002002
74811 631e99961c5f Issue #10811: Fix recursive usage of cursors. Instead of crashing, raise a ProgrammingError now. Petri Lehtinen <petri@digip.org> parents: 74709 diff changeset	756 if (self->connection && self->connection->db)
631e99961c5f Issue #10811: Fix recursive usage of cursors. Instead of crashing, raise a ProgrammingError now. Petri Lehtinen <petri@digip.org> parents: 74709 diff changeset	757 self->connection->inTransaction = !sqlite3_get_autocommit(self->connection->db);
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	758 #endif
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	759 #endif
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	760
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	761 Py_XDECREF(operation_bytestr);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	762 Py_XDECREF(parameters);
37547 48311401a20e Fix problem (not checking return result) reported by Coverity Neal Norwitz <nnorwitz@gmail.com> parents: 37518 diff changeset	763 Py_XDECREF(parameters_iter);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	764 Py_XDECREF(parameters_list);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	765
74811 631e99961c5f Issue #10811: Fix recursive usage of cursors. Instead of crashing, raise a ProgrammingError now. Petri Lehtinen <petri@digip.org> parents: 74709 diff changeset	766 self->locked = 0;
631e99961c5f Issue #10811: Fix recursive usage of cursors. Instead of crashing, raise a ProgrammingError now. Petri Lehtinen <petri@digip.org> parents: 74709 diff changeset	767
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	768 if (PyErr_Occurred()) {
47409 0156c336e6b3 Fixed rowcount for SELECT statements. They're -1 now (again), for better DB-API 2.0 compliance. Gerhard Häring <gh@ghaering.de> parents: 47294 diff changeset	769 self->rowcount = -1L;
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	770 return NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	771 } else {
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	772 Py_INCREF(self);
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	773 return (PyObject*)self;
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	774 }
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
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	777 PyObject* pysqlite_cursor_execute(pysqlite_Cursor* self, PyObject* args)
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	778 {
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	779 return _pysqlite_query_execute(self, 0, args);
37362 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
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	782 PyObject* pysqlite_cursor_executemany(pysqlite_Cursor* self, PyObject* args)
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	783 {
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	784 return _pysqlite_query_execute(self, 1, args);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	785 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	786
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	787 PyObject* pysqlite_cursor_executescript(pysqlite_Cursor* self, PyObject* args)
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	788 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	789 PyObject* script_obj;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	790 PyObject* script_str = NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	791 const char* script_cstr;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	792 sqlite3_stmt* statement;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	793 int rc;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	794 PyObject* result;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	795
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	796 if (!PyArg_ParseTuple(args, "O", &script_obj)) {
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	797 return NULL;
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	798 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	799
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	800 if (!check_cursor(self)) {
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	801 return NULL;
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
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	804 self->reset = 0;
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	805
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	806 if (PyString_Check(script_obj)) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	807 script_cstr = PyString_AsString(script_obj);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	808 } else if (PyUnicode_Check(script_obj)) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	809 script_str = PyUnicode_AsUTF8String(script_obj);
37461 6ab15fc85c2d Fix a couple of memory issues Neal Norwitz <nnorwitz@gmail.com> parents: 37458 diff changeset	810 if (!script_str) {
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	811 return NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	812 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	813
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	814 script_cstr = PyString_AsString(script_str);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	815 } else {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	816 PyErr_SetString(PyExc_ValueError, "script argument must be unicode or string.");
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	817 return NULL;
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
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	820 /* commit first */
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	821 result = pysqlite_connection_commit(self->connection, NULL);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	822 if (!result) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	823 goto error;
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 Py_DECREF(result);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	826
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	827 while (1) {
49155 76bc75772736 Issue #3846: Release GIL during calls to sqlite3_prepare. This improves concurrent access to the same database file from multiple threads/processes. Gerhard Häring <gh@ghaering.de> parents: 49154 diff changeset	828 Py_BEGIN_ALLOW_THREADS
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	829 rc = sqlite3_prepare(self->connection->db,
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	830 script_cstr,
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	831 -1,
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	832 &statement,
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	833 &script_cstr);
49155 76bc75772736 Issue #3846: Release GIL during calls to sqlite3_prepare. This improves concurrent access to the same database file from multiple threads/processes. Gerhard Häring <gh@ghaering.de> parents: 49154 diff changeset	834 Py_END_ALLOW_THREADS
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	835 if (rc != SQLITE_OK) {
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	836 _pysqlite_seterror(self->connection->db, NULL);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	837 goto error;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	838 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	839
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	840 /* execute statement, and ignore results of SELECT statements */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	841 rc = SQLITE_ROW;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	842 while (rc == SQLITE_ROW) {
49154 4c77d1016f60 Fixes issue #3103. In the sqlite3 module, made one more function static. All renaming public symbos now have the pysqlite prefix to avoid name clashes. This at least once created problems where the same symbol name appeared somewhere in Apache and the sqlite3 module was used from mod_python. Gerhard Häring <gh@ghaering.de> parents: 47951 diff changeset	843 rc = pysqlite_step(statement, self->connection);
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	844 /* TODO: we probably need more error handling here */
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	845 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	846
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	847 if (rc != SQLITE_DONE) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	848 (void)sqlite3_finalize(statement);
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	849 _pysqlite_seterror(self->connection->db, NULL);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	850 goto error;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	851 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	852
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	853 rc = sqlite3_finalize(statement);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	854 if (rc != SQLITE_OK) {
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	855 _pysqlite_seterror(self->connection->db, NULL);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	856 goto error;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	857 }
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	858
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	859 if (*script_cstr == (char)0) {
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	860 break;
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	861 }
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	862 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	863
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	864 error:
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	865 Py_XDECREF(script_str);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	866
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	867 if (PyErr_Occurred()) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	868 return NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	869 } else {
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	870 Py_INCREF(self);
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	871 return (PyObject*)self;
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	872 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	873 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	874
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	875 PyObject* pysqlite_cursor_getiter(pysqlite_Cursor *self)
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	876 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	877 Py_INCREF(self);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	878 return (PyObject*)self;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	879 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	880
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	881 PyObject* pysqlite_cursor_iternext(pysqlite_Cursor *self)
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	882 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	883 PyObject* next_row_tuple;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	884 PyObject* next_row;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	885 int rc;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	886
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	887 if (!check_cursor(self)) {
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	888 return NULL;
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	889 }
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	890
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	891 if (self->reset) {
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	892 PyErr_SetString(pysqlite_InterfaceError, errmsg_fetch_across_rollback);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	893 return NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	894 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	895
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	896 if (!self->next_row) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	897 if (self->statement) {
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	898 (void)pysqlite_statement_reset(self->statement);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	899 Py_DECREF(self->statement);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	900 self->statement = NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	901 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	902 return NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	903 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	904
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	905 next_row_tuple = self->next_row;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	906 self->next_row = NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	907
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	908 if (self->row_factory != Py_None) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	909 next_row = PyObject_CallFunction(self->row_factory, "OO", self, next_row_tuple);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	910 Py_DECREF(next_row_tuple);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	911 } else {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	912 next_row = next_row_tuple;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	913 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	914
46322 fb5eaa4be700 Fix for Issue2515: Don't crash when trying to fetch data from a closed cursor. Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	915 if (self->statement) {
49154 4c77d1016f60 Fixes issue #3103. In the sqlite3 module, made one more function static. All renaming public symbos now have the pysqlite prefix to avoid name clashes. This at least once created problems where the same symbol name appeared somewhere in Apache and the sqlite3 module was used from mod_python. Gerhard Häring <gh@ghaering.de> parents: 47951 diff changeset	916 rc = pysqlite_step(self->statement->st, self->connection);
46322 fb5eaa4be700 Fix for Issue2515: Don't crash when trying to fetch data from a closed cursor. Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	917 if (rc != SQLITE_DONE && rc != SQLITE_ROW) {
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	918 (void)pysqlite_statement_reset(self->statement);
46322 fb5eaa4be700 Fix for Issue2515: Don't crash when trying to fetch data from a closed cursor. Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	919 Py_DECREF(next_row);
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	920 _pysqlite_seterror(self->connection->db, NULL);
46322 fb5eaa4be700 Fix for Issue2515: Don't crash when trying to fetch data from a closed cursor. Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	921 return NULL;
fb5eaa4be700 Fix for Issue2515: Don't crash when trying to fetch data from a closed cursor. Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	922 }
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	923
46322 fb5eaa4be700 Fix for Issue2515: Don't crash when trying to fetch data from a closed cursor. Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	924 if (rc == SQLITE_ROW) {
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	925 self->next_row = _pysqlite_fetch_one_row(self);
46322 fb5eaa4be700 Fix for Issue2515: Don't crash when trying to fetch data from a closed cursor. Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	926 }
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	927 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	928
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	929 return next_row;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	930 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	931
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	932 PyObject* pysqlite_cursor_fetchone(pysqlite_Cursor* self, PyObject* args)
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	933 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	934 PyObject* row;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	935
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	936 row = pysqlite_cursor_iternext(self);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	937 if (!row && !PyErr_Occurred()) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	938 Py_INCREF(Py_None);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	939 return Py_None;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	940 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	941
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	942 return row;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	943 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	944
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	945 PyObject* pysqlite_cursor_fetchmany(pysqlite_Cursor* self, PyObject* args, PyObject* kwargs)
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	946 {
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	947 static char *kwlist[] = {"size", NULL, NULL};
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	948
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	949 PyObject* row;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	950 PyObject* list;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	951 int maxrows = self->arraysize;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	952 int counter = 0;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	953
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	954 if (!PyArg_ParseTupleAndKeywords(args, kwargs, "\|i:fetchmany", kwlist, &maxrows)) {
b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	955 return NULL;
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	956 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	957
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	958 list = PyList_New(0);
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	959 if (!list) {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	960 return NULL;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	961 }
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	962
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	963 /* just make sure we enter the loop */
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	964 row = Py_None;
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	965
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	966 while (row) {
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	967 row = pysqlite_cursor_iternext(self);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	968 if (row) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	969 PyList_Append(list, row);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	970 Py_DECREF(row);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	971 } else {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	972 break;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	973 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	974
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	975 if (++counter == maxrows) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	976 break;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	977 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	978 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	979
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	980 if (PyErr_Occurred()) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	981 Py_DECREF(list);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	982 return NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	983 } else {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	984 return list;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	985 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	986 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	987
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	988 PyObject* pysqlite_cursor_fetchall(pysqlite_Cursor* self, PyObject* args)
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	989 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	990 PyObject* row;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	991 PyObject* list;
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 list = PyList_New(0);
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	994 if (!list) {
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	995 return NULL;
d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	996 }
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	997
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	998 /* just make sure we enter the loop */
37458 d27058c409df Update to pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37387 diff changeset	999 row = (PyObject*)Py_None;
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1000
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1001 while (row) {
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	1002 row = pysqlite_cursor_iternext(self);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1003 if (row) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1004 PyList_Append(list, row);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1005 Py_DECREF(row);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1006 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1007 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1008
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1009 if (PyErr_Occurred()) {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1010 Py_DECREF(list);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1011 return NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1012 } else {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1013 return list;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1014 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1015 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1016
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	1017 PyObject* pysqlite_noop(pysqlite_Connection* self, PyObject* args)
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1018 {
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1019 /* don't care, return None */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1020 Py_INCREF(Py_None);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1021 return Py_None;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1022 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1023
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	1024 PyObject* pysqlite_cursor_close(pysqlite_Cursor* self, PyObject* args)
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1025 {
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	1026 if (!pysqlite_check_thread(self->connection) \|\| !pysqlite_check_connection(self->connection)) {
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1027 return NULL;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1028 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1029
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1030 if (self->statement) {
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	1031 (void)pysqlite_statement_reset(self->statement);
47951 afe8d515bfe2 Issue #3153: sqlite leaks on error. Alexandre Vassalotti <alexandre@peadrop.com> parents: 47527 diff changeset	1032 Py_CLEAR(self->statement);
37362 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
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	1035 self->closed = 1;
04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	1036
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1037 Py_INCREF(Py_None);
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1038 return Py_None;
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1039 }
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1040
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1041 static PyMethodDef cursor_methods[] = {
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	1042 {"execute", (PyCFunction)pysqlite_cursor_execute, METH_VARARGS,
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1043 PyDoc_STR("Executes a SQL statement.")},
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	1044 {"executemany", (PyCFunction)pysqlite_cursor_executemany, METH_VARARGS,
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1045 PyDoc_STR("Repeatedly executes a SQL statement.")},
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	1046 {"executescript", (PyCFunction)pysqlite_cursor_executescript, METH_VARARGS,
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1047 PyDoc_STR("Executes a multiple SQL statements at once. Non-standard.")},
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	1048 {"fetchone", (PyCFunction)pysqlite_cursor_fetchone, METH_NOARGS,
47807 68cf3cbb21d2 #3157: Fix docstrings for cursor methods. Georg Brandl <georg@python.org> parents: 46322 diff changeset	1049 PyDoc_STR("Fetches one row from the resultset.")},
45580 b7ee9074ca0e Updated to pysqlite 2.4.1. Documentation additions will come later. Gerhard Häring <gh@ghaering.de> parents: 44791 diff changeset	1050 {"fetchmany", (PyCFunction)pysqlite_cursor_fetchmany, METH_VARARGS\|METH_KEYWORDS,
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1051 PyDoc_STR("Fetches several rows from the resultset.")},
44791 15536865198a #1509: fix sqlite3 docstrings and docs w.r.t. cursor.fetchXXX methods. Georg Brandl <georg@python.org> parents: 44350 diff changeset	1052 {"fetchall", (PyCFunction)pysqlite_cursor_fetchall, METH_NOARGS,
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1053 PyDoc_STR("Fetches all rows from the resultset.")},
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	1054 {"close", (PyCFunction)pysqlite_cursor_close, METH_NOARGS,
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1055 PyDoc_STR("Closes the cursor.")},
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1056 {"setinputsizes", (PyCFunction)pysqlite_noop, METH_VARARGS,
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1057 PyDoc_STR("Required by DB-API. Does nothing in pysqlite.")},
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1058 {"setoutputsize", (PyCFunction)pysqlite_noop, METH_VARARGS,
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1059 PyDoc_STR("Required by DB-API. Does nothing in pysqlite.")},
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1060 {NULL, NULL}
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1061 };
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1062
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1063 static struct PyMemberDef cursor_members[] =
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1064 {
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	1065 {"connection", T_OBJECT, offsetof(pysqlite_Cursor, connection), RO},
b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	1066 {"description", T_OBJECT, offsetof(pysqlite_Cursor, description), RO},
b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	1067 {"arraysize", T_INT, offsetof(pysqlite_Cursor, arraysize), 0},
b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	1068 {"lastrowid", T_OBJECT, offsetof(pysqlite_Cursor, lastrowid), RO},
47409 0156c336e6b3 Fixed rowcount for SELECT statements. They're -1 now (again), for better DB-API 2.0 compliance. Gerhard Häring <gh@ghaering.de> parents: 47294 diff changeset	1069 {"rowcount", T_LONG, offsetof(pysqlite_Cursor, rowcount), RO},
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	1070 {"row_factory", T_OBJECT, offsetof(pysqlite_Cursor, row_factory), 0},
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1071 {NULL}
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1072 };
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1073
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37547 diff changeset	1074 static char cursor_doc[] =
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37547 diff changeset	1075 PyDoc_STR("SQLite database cursor class.");
7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37547 diff changeset	1076
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	1077 PyTypeObject pysqlite_CursorType = {
42333 6620a510e9a9 PEP 3123: Provide forward compatibility with Python 3.0, while keeping Martin v. Löwis <martin@v.loewis.de> parents: 40625 diff changeset	1078 PyVarObject_HEAD_INIT(NULL, 0)
37495 d3969aeba777 upgrade to final version of pysqlite 2.2.0 Anthony Baxter <anthonybaxter@gmail.com> parents: 37461 diff changeset	1079 MODULE_NAME ".Cursor", /* tp_name */
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	1080 sizeof(pysqlite_Cursor), /* tp_basicsize */
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1081 0, /* tp_itemsize */
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	1082 (destructor)pysqlite_cursor_dealloc, /* tp_dealloc */
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1083 0, /* tp_print */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1084 0, /* tp_getattr */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1085 0, /* tp_setattr */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1086 0, /* tp_compare */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1087 0, /* tp_repr */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1088 0, /* tp_as_number */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1089 0, /* tp_as_sequence */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1090 0, /* tp_as_mapping */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1091 0, /* tp_hash */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1092 0, /* tp_call */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1093 0, /* tp_str */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1094 0, /* tp_getattro */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1095 0, /* tp_setattro */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1096 0, /* tp_as_buffer */
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	1097 Py_TPFLAGS_DEFAULT\|Py_TPFLAGS_HAVE_ITER\|Py_TPFLAGS_BASETYPE\|Py_TPFLAGS_HAVE_WEAKREFS, /* tp_flags */
37938 7da4af95ebad Updated the sqlite3 module to the external pysqlite 2.2.2 version. Gerhard Häring <gh@ghaering.de> parents: 37547 diff changeset	1098 cursor_doc, /* tp_doc */
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1099 0, /* tp_traverse */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1100 0, /* tp_clear */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1101 0, /* tp_richcompare */
59362 04d3ae52ff73 Merged code from pysqlite 2.6.0. Gerhard Häring <gh@ghaering.de> parents: 49155 diff changeset	1102 offsetof(pysqlite_Cursor, in_weakreflist), /* tp_weaklistoffset */
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	1103 (getiterfunc)pysqlite_cursor_getiter, /* tp_iter */
b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	1104 (iternextfunc)pysqlite_cursor_iternext, /* tp_iternext */
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1105 cursor_methods, /* tp_methods */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1106 cursor_members, /* tp_members */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1107 0, /* tp_getset */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1108 0, /* tp_base */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1109 0, /* tp_dict */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1110 0, /* tp_descr_get */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1111 0, /* tp_descr_set */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1112 0, /* tp_dictoffset */
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	1113 (initproc)pysqlite_cursor_init, /* tp_init */
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1114 0, /* tp_alloc */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1115 0, /* tp_new */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1116 0 /* tp_free */
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1117 };
e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1118
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	1119 extern int pysqlite_cursor_setup_types(void)
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1120 {
40625 b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	1121 pysqlite_CursorType.tp_new = PyType_GenericNew;
b9d4ced23506 Merged changes from standalone version 2.3.3. This should probably all be Gerhard Häring <gh@ghaering.de> parents: 39251 diff changeset	1122 return PyType_Ready(&pysqlite_CursorType);
37362 e546274d6503 merged the sqlite-integration branch. Anthony Baxter <anthonybaxter@gmail.com> parents: diff changeset	1123 }

Mercurial > cpython-lru_cache-weakref

annotate Modules/_sqlite/cursor.c @ 82251:bb5a8564e186 2.7