svn+ssh://pythondev@svn.python.org/python/trunk ................ r62425 | andrew.kuchling | 2008-04-21 03:45:57 +0200 (Mon, 21 Apr 2008) | 1 line Comment typo ................ r62426 | mark.dickinson | 2008-04-21 03:55:50 +0200 (Mon, 21 Apr 2008) | 2 lines Silence 'r may be used uninitialized' compiler warning. ................ r62427 | andrew.kuchling | 2008-04-21 04:08:00 +0200 (Mon, 21 Apr 2008) | 1 line Markup fix ................ r62428 | andrew.kuchling | 2008-04-21 04:08:13 +0200 (Mon, 21 Apr 2008) | 1 line Wording changes ................ r62429 | andrew.kuchling | 2008-04-21 04:14:24 +0200 (Mon, 21 Apr 2008) | 1 line Add various items ................ r62434 | thomas.heller | 2008-04-21 15:46:55 +0200 (Mon, 21 Apr 2008) | 1 line Fix typo. ................ r62435 | david.goodger | 2008-04-21 16:40:22 +0200 (Mon, 21 Apr 2008) | 1 line corrections ("reStructuredText" is one word) ................ r62436 | david.goodger | 2008-04-21 16:43:33 +0200 (Mon, 21 Apr 2008) | 1 line capitalization ................ r62441 | gregory.p.smith | 2008-04-21 19:46:40 +0200 (Mon, 21 Apr 2008) | 2 lines explicitly flush after the ... since there wasn't a newline ................ r62444 | jeroen.ruigrok | 2008-04-21 22:15:39 +0200 (Mon, 21 Apr 2008) | 2 lines Windows x64 also falls under VER_PLATFORM_WIN32_NT. ................ r62446 | gregory.p.smith | 2008-04-21 23:31:08 +0200 (Mon, 21 Apr 2008) | 3 lines If sys.stdin is not a tty, fall back to default_getpass after printing a warning instead of failing with a termios.error. ................ r62447 | mark.dickinson | 2008-04-22 00:32:24 +0200 (Tue, 22 Apr 2008) | 8 lines test_math and test_cmath are failing on the FreeBSD 6.2 trunk buildbot, apparently because tanh(-0.) loses the sign of zero on that platform. If true, this is a bug in FreeBSD. Added a configure test to verify this. I still need to figure out how best to deal with this failure. ................ r62448 | amaury.forgeotdarc | 2008-04-22 00:35:30 +0200 (Tue, 22 Apr 2008) | 7 lines Issue 2665: On Windows, sys.stderr does not contain a valid file when running without a console. It seems to work, but will fail at the first flush. This causes IDLE to crash when too many warnings are printed. Will backport. ................ r62450 | benjamin.peterson | 2008-04-22 00:57:00 +0200 (Tue, 22 Apr 2008) | 2 lines Fix Sphinx warnings ................ r62451 | mark.dickinson | 2008-04-22 02:54:27 +0200 (Tue, 22 Apr 2008) | 3 lines Make configure test for tanh(-0.) == -0. committed in r62447 actually work. (The test wasn't properly linked with libm. Sigh.) ................ r62452 | benjamin.peterson | 2008-04-22 04:16:03 +0200 (Tue, 22 Apr 2008) | 2 lines Various io doc updates ................ r62453 | neal.norwitz | 2008-04-22 07:07:47 +0200 (Tue, 22 Apr 2008) | 1 line Add Thomas Lee ................ r62454 | gregory.p.smith | 2008-04-22 10:08:41 +0200 (Tue, 22 Apr 2008) | 8 lines Major improvements: * Default to using /dev/tty for the password prompt and input before falling back to sys.stdin and sys.stderr. * Use sys.stderr instead of sys.stdout. * print the 'password may be echoed' warning to stream used to display the prompt rather than always sys.stderr. * warn() with GetPassWarning when input may be echoed. ................ r62455 | gregory.p.smith | 2008-04-22 10:11:33 +0200 (Tue, 22 Apr 2008) | 2 lines update the getpass entry ................ r62463 | amaury.forgeotdarc | 2008-04-22 23:14:41 +0200 (Tue, 22 Apr 2008) | 5 lines Issue #2670: urllib2.build_opener() failed when two handlers derive the same default base class. Will backport. ................ r62465 | skip.montanaro | 2008-04-23 00:45:09 +0200 (Wed, 23 Apr 2008) | 3 lines Factor in documentation changes from issue 1753732. ................ r62466 | gregory.p.smith | 2008-04-23 03:06:42 +0200 (Wed, 23 Apr 2008) | 2 lines syntax fixup ................ r62469 | benjamin.peterson | 2008-04-23 22:38:06 +0200 (Wed, 23 Apr 2008) | 2 lines #2673 Fix example typo in optparse docs ................ r62474 | martin.v.loewis | 2008-04-24 11:50:50 +0200 (Thu, 24 Apr 2008) | 2 lines Add Guilherme Polo. ................ r62476 | martin.v.loewis | 2008-04-24 15:16:36 +0200 (Thu, 24 Apr 2008) | 3 lines Remove Py_Refcnt, Py_Type, Py_Size, as they were added only for backwards compatibility, yet 2.5 did not have them at all. ................ r62477 | martin.v.loewis | 2008-04-24 15:17:24 +0200 (Thu, 24 Apr 2008) | 2 lines Fix typo. ................ r62478 | martin.v.loewis | 2008-04-24 15:18:03 +0200 (Thu, 24 Apr 2008) | 2 lines Add Jesus Cea. ................ r62480 | amaury.forgeotdarc | 2008-04-24 20:07:05 +0200 (Thu, 24 Apr 2008) | 4 lines Issue2681: the literal 0o8 was wrongly accepted, and evaluated as float(0.0). This happened only when 8 is the first digit. Credits go to Lukas Meuser. ................ r62485 | amaury.forgeotdarc | 2008-04-24 22:10:26 +0200 (Thu, 24 Apr 2008) | 5 lines Disable gc when running test_trace, or we may record the __del__ of collected objects. See http://mail.python.org/pipermail/python-checkins/2008-April/068633.html the extra events perfectly match several calls to socket._fileobject.__del__() ................ r62492 | neal.norwitz | 2008-04-25 05:40:17 +0200 (Fri, 25 Apr 2008) | 1 line Fix typo (now -> no) ................ r62497 | armin.rigo | 2008-04-25 11:35:18 +0200 (Fri, 25 Apr 2008) | 2 lines A new crasher. ................ r62498 | thomas.heller | 2008-04-25 17:44:16 +0200 (Fri, 25 Apr 2008) | 1 line Add from_buffer and from_buffer_copy class methods to ctypes types. ................ r62500 | mark.dickinson | 2008-04-25 18:59:09 +0200 (Fri, 25 Apr 2008) | 3 lines Issue 2635: fix bug in the fix_sentence_endings option to textwrap.fill. ................ r62507 | benjamin.peterson | 2008-04-25 23:43:56 +0200 (Fri, 25 Apr 2008) | 2 lines Allow test_import to work when it is invoked directly ................ r62513 | georg.brandl | 2008-04-26 20:31:07 +0200 (Sat, 26 Apr 2008) | 2 lines #2691: document PyLong (s)size_t APIs, patch by Alexander Belopolsky. ................ r62514 | georg.brandl | 2008-04-26 20:32:17 +0200 (Sat, 26 Apr 2008) | 2 lines Add missing return type to dealloc. ................ r62516 | alexandre.vassalotti | 2008-04-27 02:52:24 +0200 (Sun, 27 Apr 2008) | 2 lines Fixed URL of PEP 205 in weakref's module docstring. ................ r62521 | georg.brandl | 2008-04-27 11:39:59 +0200 (Sun, 27 Apr 2008) | 2 lines #2677: add note that not all functions may accept keyword args. ................ r62531 | georg.brandl | 2008-04-27 19:38:55 +0200 (Sun, 27 Apr 2008) | 2 lines Use correct XHTML tags. ................ r62535 | benjamin.peterson | 2008-04-27 20:14:39 +0200 (Sun, 27 Apr 2008) | 2 lines #2700 Document PyNumber_ToBase ................ r62545 | skip.montanaro | 2008-04-27 22:53:57 +0200 (Sun, 27 Apr 2008) | 1 line minor wording changes, rewrap a few lines ................ r62546 | kurt.kaiser | 2008-04-27 23:07:41 +0200 (Sun, 27 Apr 2008) | 7 lines Home / Control-A toggles between left margin and end of leading white space. Patch 1196903 Jeff Shute. M idlelib/PyShell.py M idlelib/EditorWindow.py M idlelib/NEWS.txt ................ r62548 | kurt.kaiser | 2008-04-27 23:38:05 +0200 (Sun, 27 Apr 2008) | 2 lines Improved AutoCompleteWindow logic. Patch 2062 Tal Einat. ................ r62549 | kurt.kaiser | 2008-04-27 23:52:19 +0200 (Sun, 27 Apr 2008) | 4 lines Autocompletion of filenames now support alternate separators, e.g. the '/' char on Windows. Patch 2061 Tal Einat. ................ r62550 | skip.montanaro | 2008-04-28 00:49:56 +0200 (Mon, 28 Apr 2008) | 6 lines A few small changes: * The only exception we should catch when trying to import cStringIO is an ImportError. * Delete the function signatures embedded in the mk*temp docstrings. * The tempdir global variable was initialized twice. ................ r62551 | skip.montanaro | 2008-04-28 00:52:02 +0200 (Mon, 28 Apr 2008) | 4 lines Wrap some long paragraphs and include the default values for optional function parameters. ................ r62553 | skip.montanaro | 2008-04-28 04:57:23 +0200 (Mon, 28 Apr 2008) | 7 lines Minor cleanups: * Avoid creating unused local variables where we can. Where we can't prefix the unused variables with '_'. * Avoid shadowing builtins where it won't change the external interface of a function. * Use None as default path arg to readmodule and readmodule_ex. ................ r62554 | skip.montanaro | 2008-04-28 04:59:45 +0200 (Mon, 28 Apr 2008) | 6 lines Correct documentation to match implementation: "Class" instead of "class_descriptor", "Function" instead of "function_descriptor". Note default path value for readmodule*. Wrap some long paragraphs. Don't mention 'inpackage' which isn't part of the public API. ................ r62555 | brett.cannon | 2008-04-28 05:23:50 +0200 (Mon, 28 Apr 2008) | 5 lines Fix a bug introduced by the warnings rewrite where tracebacks were being improperly indented. Closes issue #2699. ................ r62556 | skip.montanaro | 2008-04-28 05:25:37 +0200 (Mon, 28 Apr 2008) | 2 lines Wrap some long lines. ................ r62557 | skip.montanaro | 2008-04-28 05:27:53 +0200 (Mon, 28 Apr 2008) | 6 lines Get rid of _test(), _main(), _debug() and _check(). Tests are no longer needed (better set available in Lib/test/test_robotparser.py). Clean up a few PEP 8 nits (compound statements on a single line, whitespace around operators). ................ r62558 | brett.cannon | 2008-04-28 06:50:06 +0200 (Mon, 28 Apr 2008) | 3 lines Rename the test_traceback_print() function to traceback_print() to prevent test_capi from automatically calling the function. ................ r62559 | georg.brandl | 2008-04-28 07:16:30 +0200 (Mon, 28 Apr 2008) | 2 lines Fix markup. ................ r62569 | amaury.forgeotdarc | 2008-04-28 23:07:06 +0200 (Mon, 28 Apr 2008) | 5 lines test_sundry performs minimal tests (a simple import...) on modules that are not tested otherwise. Some of them now have tests and can be removed. Only 70 to go... ................ r62574 | andrew.kuchling | 2008-04-29 04:03:54 +0200 (Tue, 29 Apr 2008) | 1 line Strip down SSL docs; I'm not managing to get test programs working, so I'll just give a minimal description ................ r62577 | martin.v.loewis | 2008-04-29 08:10:53 +0200 (Tue, 29 Apr 2008) | 2 lines Add Rodrigo and Heiko. ................ r62593 | nick.coghlan | 2008-04-30 16:23:36 +0200 (Wed, 30 Apr 2008) | 1 line Update command line usage documentation to reflect 2.6 changes (also includes some minor cleanups). Addresses TODO list issue 2258 ................ r62595 | andrew.kuchling | 2008-04-30 18:19:55 +0200 (Wed, 30 Apr 2008) | 1 line Typo fix ................ r62604 | benjamin.peterson | 2008-04-30 23:03:58 +0200 (Wed, 30 Apr 2008) | 2 lines make test_support's captured_output a bit more robust when exceptions happen ................ r62605 | georg.brandl | 2008-04-30 23:08:42 +0200 (Wed, 30 Apr 2008) | 2 lines #1748: use functools.wraps instead of rolling own metadata update. ................ r62606 | benjamin.peterson | 2008-04-30 23:25:55 +0200 (Wed, 30 Apr 2008) | 2 lines Remove some from __future__ import with_statements ................ r62608 | benjamin.peterson | 2008-05-01 00:03:36 +0200 (Thu, 01 May 2008) | 2 lines Fix typo in whatsnew ................ r62616 | georg.brandl | 2008-05-01 20:24:32 +0200 (Thu, 01 May 2008) | 2 lines Fix synopsis. ................ r62626 | brett.cannon | 2008-05-02 04:25:09 +0200 (Fri, 02 May 2008) | 6 lines Fix a backwards-compatibility mistake where a new optional argument for warnings.showwarning() was being used. This broke pre-existing replacements for the function since they didn't support the extra argument. Closes issue 2705. ................ r62627 | gregory.p.smith | 2008-05-02 09:26:52 +0200 (Fri, 02 May 2008) | 20 lines This should fix issue2632. A long description of the two competing problems is in the bug report (one old, one recently introduced trying to fix the old one). In short: buffer data during socket._fileobject.read() and readlines() within a cStringIO object instead of a [] of str()s returned from the recv() call. This prevents excessive memory use due to the size parameter being passed to recv() being grossly larger than the actual size of the data returned *and* prevents excessive cpu usage due to looping in python calling recv() with a very tiny size value if min() is used as the previous memory-use bug "fix" did. It also documents what the socket._fileobject._rbufsize member is actually used for. This is a candidate for back porting to 2.5. ................ r62636 | mark.hammond | 2008-05-02 14:48:15 +0200 (Fri, 02 May 2008) | 2 lines #2581: Vista UAC/elevation support for bdist_wininst ................ r62638 | facundo.batista | 2008-05-02 19:39:00 +0200 (Fri, 02 May 2008) | 3 lines Fixed some test structures. Thanks Mark Dickinson. ................ r62644 | ronald.oussoren | 2008-05-02 21:45:11 +0200 (Fri, 02 May 2008) | 7 lines Fix for issue #2573: Can't change the framework name on OS X builds This introduces a new configure option: --with-framework-name=NAME (defaulting to 'Python'). This allows you to install several copies of the Python framework with different names (such as a normal build and a debug build). ................ r62645 | ronald.oussoren | 2008-05-02 21:58:56 +0200 (Fri, 02 May 2008) | 2 lines Finish fix for issue2573, previous patch was incomplete. ................ r62647 | martin.v.loewis | 2008-05-02 23:30:20 +0200 (Fri, 02 May 2008) | 13 lines Merged revisions 62263-62646 via svnmerge from svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r62470 | david.wolever | 2008-04-24 02:11:07 +0200 (Do, 24 Apr 2008) | 3 lines Fixed up and applied the patch for #2431 -- speeding up 2to3 with a lookup table. ........ r62646 | martin.v.loewis | 2008-05-02 23:29:27 +0200 (Fr, 02 Mai 2008) | 2 lines Fix whitespace. ........ ................ r62648 | ronald.oussoren | 2008-05-02 23:42:35 +0200 (Fri, 02 May 2008) | 4 lines Fix for #1905: PythonLauncher not working correctly on OSX 10.5/Leopard This fixes both Python Launchar and the terminalcommand module. ................ r62651 | ronald.oussoren | 2008-05-02 23:54:56 +0200 (Fri, 02 May 2008) | 2 lines Fix for issue #2520 (cannot import macerrors) ................ r62652 | benjamin.peterson | 2008-05-03 00:12:58 +0200 (Sat, 03 May 2008) | 2 lines capitalization nit for reStructuredText ................ r62653 | brett.cannon | 2008-05-03 03:02:41 +0200 (Sat, 03 May 2008) | 2 lines Fix some indentation errors. ................ r62656 | brett.cannon | 2008-05-03 05:19:39 +0200 (Sat, 03 May 2008) | 6 lines Fix the C implementation of 'warnings' to infer the filename of the module that raised an exception properly when __file__ is not set, __name__ == '__main__', and sys.argv[0] is a false value. Closes issue2743. ................ r62661 | amaury.forgeotdarc | 2008-05-03 14:21:13 +0200 (Sat, 03 May 2008) | 8 lines In test_io, StatefulIncrementalDecoderTest was not part of the test suite. And of course, the test failed: a bytearray was used without reason in io.TextIOWrapper.tell(). The difference is that iterating over bytes (i.e. str in python2.6) returns 1-char bytes, whereas bytearrays yield integers. This code should still work with python3.0 ................ r62663 | benjamin.peterson | 2008-05-03 17:56:42 +0200 (Sat, 03 May 2008) | 2 lines The compiling struct is now passed around to all AST helpers (see issue 2720) ................ r62680 | benjamin.peterson | 2008-05-03 23:35:18 +0200 (Sat, 03 May 2008) | 2 lines Moved testing of builtin types out of test_builtin and into type specific modules ................ r62686 | mark.dickinson | 2008-05-04 04:25:46 +0200 (Sun, 04 May 2008) | 4 lines Make sure that Context traps and flags dictionaries have values 0 and 1 (as documented) rather than True and False. ................ r62687 | benjamin.peterson | 2008-05-04 05:05:49 +0200 (Sun, 04 May 2008) | 2 lines Fix typo in whatsnew ................ r62696 | georg.brandl | 2008-05-04 11:15:04 +0200 (Sun, 04 May 2008) | 2 lines #2752: wrong meaning of '' for socket host. ................ r62699 | christian.heimes | 2008-05-04 13:50:53 +0200 (Sun, 04 May 2008) | 1 line Added note that Python requires at least Win2k SP4 ................ r62700 | gerhard.haering | 2008-05-04 14:59:57 +0200 (Sun, 04 May 2008) | 3 lines SQLite requires 64-bit integers in order to build. So the whole HAVE_LONG_LONG #ifdefing was useless. ................ r62701 | gerhard.haering | 2008-05-04 15:15:12 +0200 (Sun, 04 May 2008) | 3 lines Applied sqliterow-richcmp.diff patch from Thomas Heller in Issue2152. The sqlite3.Row type is now correctly hashable. ................ r62702 | gerhard.haering | 2008-05-04 15:42:44 +0200 (Sun, 04 May 2008) | 5 lines Implemented feature request 2157: Converter names are cut off at '(' characters. This avoids the common case of something like 'NUMBER(10)' not being parsed as 'NUMBER', like expected. Also corrected the docs about converter names being case-sensitive. They aren't any longer. ................ r62703 | georg.brandl | 2008-05-04 17:45:05 +0200 (Sun, 04 May 2008) | 2 lines #2757: Remove spare newline. ................ r62711 | benjamin.peterson | 2008-05-04 21:10:02 +0200 (Sun, 04 May 2008) | 2 lines Fix typo in bugs.rst ................
514 lines
17 KiB
C
514 lines
17 KiB
C
/* statement.c - the statement type
|
|
*
|
|
* Copyright (C) 2005-2007 Gerhard Häring <gh@ghaering.de>
|
|
*
|
|
* This file is part of pysqlite.
|
|
*
|
|
* This software is provided 'as-is', without any express or implied
|
|
* warranty. In no event will the authors be held liable for any damages
|
|
* arising from the use of this software.
|
|
*
|
|
* Permission is granted to anyone to use this software for any purpose,
|
|
* including commercial applications, and to alter it and redistribute it
|
|
* freely, subject to the following restrictions:
|
|
*
|
|
* 1. The origin of this software must not be misrepresented; you must not
|
|
* claim that you wrote the original software. If you use this software
|
|
* in a product, an acknowledgment in the product documentation would be
|
|
* appreciated but is not required.
|
|
* 2. Altered source versions must be plainly marked as such, and must not be
|
|
* misrepresented as being the original software.
|
|
* 3. This notice may not be removed or altered from any source distribution.
|
|
*/
|
|
|
|
#include "statement.h"
|
|
#include "cursor.h"
|
|
#include "connection.h"
|
|
#include "microprotocols.h"
|
|
#include "prepare_protocol.h"
|
|
#include "sqlitecompat.h"
|
|
|
|
/* prototypes */
|
|
static int pysqlite_check_remaining_sql(const char* tail);
|
|
|
|
typedef enum {
|
|
LINECOMMENT_1,
|
|
IN_LINECOMMENT,
|
|
COMMENTSTART_1,
|
|
IN_COMMENT,
|
|
COMMENTEND_1,
|
|
NORMAL
|
|
} parse_remaining_sql_state;
|
|
|
|
typedef enum {
|
|
TYPE_LONG,
|
|
TYPE_FLOAT,
|
|
TYPE_STRING,
|
|
TYPE_UNICODE,
|
|
TYPE_BUFFER,
|
|
TYPE_UNKNOWN
|
|
} parameter_type;
|
|
|
|
int pysqlite_statement_create(pysqlite_Statement* self, pysqlite_Connection* connection, PyObject* sql)
|
|
{
|
|
const char* tail;
|
|
int rc;
|
|
const char* sql_cstr;
|
|
Py_ssize_t sql_cstr_len;
|
|
|
|
self->st = NULL;
|
|
self->in_use = 0;
|
|
|
|
sql_cstr = PyUnicode_AsStringAndSize(sql, &sql_cstr_len);
|
|
if (sql_cstr == NULL) {
|
|
rc = PYSQLITE_SQL_WRONG_TYPE;
|
|
return rc;
|
|
}
|
|
|
|
self->in_weakreflist = NULL;
|
|
Py_INCREF(sql);
|
|
self->sql = sql;
|
|
|
|
rc = sqlite3_prepare(connection->db,
|
|
sql_cstr,
|
|
-1,
|
|
&self->st,
|
|
&tail);
|
|
|
|
self->db = connection->db;
|
|
|
|
if (rc == SQLITE_OK && pysqlite_check_remaining_sql(tail)) {
|
|
(void)sqlite3_finalize(self->st);
|
|
self->st = NULL;
|
|
rc = PYSQLITE_TOO_MUCH_SQL;
|
|
}
|
|
|
|
return rc;
|
|
}
|
|
|
|
int pysqlite_statement_bind_parameter(pysqlite_Statement* self, int pos, PyObject* parameter, int allow_8bit_chars)
|
|
{
|
|
int rc = SQLITE_OK;
|
|
PY_LONG_LONG longlongval;
|
|
const char* buffer;
|
|
char* string;
|
|
Py_ssize_t buflen;
|
|
parameter_type paramtype;
|
|
char* c;
|
|
|
|
if (parameter == Py_None) {
|
|
rc = sqlite3_bind_null(self->st, pos);
|
|
goto final;
|
|
}
|
|
|
|
if (PyLong_CheckExact(parameter)) {
|
|
paramtype = TYPE_LONG;
|
|
} else if (PyFloat_CheckExact(parameter)) {
|
|
paramtype = TYPE_FLOAT;
|
|
} else if (PyUnicode_CheckExact(parameter)) {
|
|
paramtype = TYPE_UNICODE;
|
|
} else if (PyLong_Check(parameter)) {
|
|
paramtype = TYPE_LONG;
|
|
} else if (PyFloat_Check(parameter)) {
|
|
paramtype = TYPE_FLOAT;
|
|
} else if (PyUnicode_Check(parameter)) {
|
|
paramtype = TYPE_STRING;
|
|
} else if (PyObject_CheckBuffer(parameter)) {
|
|
paramtype = TYPE_BUFFER;
|
|
} else {
|
|
paramtype = TYPE_UNKNOWN;
|
|
}
|
|
|
|
if (paramtype == TYPE_STRING && !allow_8bit_chars) {
|
|
string = PyString_AS_STRING(parameter);
|
|
for (c = string; *c != 0; c++) {
|
|
if (*c & 0x80) {
|
|
PyErr_SetString(pysqlite_ProgrammingError, "You must not use 8-bit bytestrings unless you use a text_factory that can interpret 8-bit bytestrings (like text_factory = str). It is highly recommended that you instead just switch your application to Unicode strings.");
|
|
rc = -1;
|
|
goto final;
|
|
}
|
|
}
|
|
}
|
|
|
|
switch (paramtype) {
|
|
case TYPE_LONG:
|
|
/* in the overflow error case, longval/longlongval is -1, and an exception is set */
|
|
longlongval = PyLong_AsLongLong(parameter);
|
|
rc = sqlite3_bind_int64(self->st, pos, (sqlite_int64)longlongval);
|
|
break;
|
|
case TYPE_FLOAT:
|
|
rc = sqlite3_bind_double(self->st, pos, PyFloat_AsDouble(parameter));
|
|
break;
|
|
case TYPE_UNICODE:
|
|
string = PyUnicode_AsString(parameter);
|
|
rc = sqlite3_bind_text(self->st, pos, string, -1, SQLITE_TRANSIENT);
|
|
break;
|
|
case TYPE_BUFFER:
|
|
if (PyObject_AsCharBuffer(parameter, &buffer, &buflen) == 0) {
|
|
rc = sqlite3_bind_blob(self->st, pos, buffer, buflen, SQLITE_TRANSIENT);
|
|
} else {
|
|
PyErr_SetString(PyExc_ValueError, "could not convert BLOB to buffer");
|
|
rc = -1;
|
|
}
|
|
break;
|
|
case TYPE_UNKNOWN:
|
|
rc = -1;
|
|
}
|
|
|
|
final:
|
|
return rc;
|
|
}
|
|
|
|
/* returns 0 if the object is one of Python's internal ones that don't need to be adapted */
|
|
static int _need_adapt(PyObject* obj)
|
|
{
|
|
if (pysqlite_BaseTypeAdapted) {
|
|
return 1;
|
|
}
|
|
|
|
if (PyLong_CheckExact(obj) || PyFloat_CheckExact(obj)
|
|
|| PyUnicode_CheckExact(obj) || PyBytes_CheckExact(obj)) {
|
|
return 0;
|
|
} else {
|
|
return 1;
|
|
}
|
|
}
|
|
|
|
void pysqlite_statement_bind_parameters(pysqlite_Statement* self, PyObject* parameters, int allow_8bit_chars)
|
|
{
|
|
PyObject* current_param;
|
|
PyObject* adapted;
|
|
const char* binding_name;
|
|
int i;
|
|
int rc;
|
|
int num_params_needed;
|
|
int num_params;
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
num_params_needed = sqlite3_bind_parameter_count(self->st);
|
|
Py_END_ALLOW_THREADS
|
|
|
|
if (PyTuple_CheckExact(parameters) || PyList_CheckExact(parameters) || (!PyDict_Check(parameters) && PySequence_Check(parameters))) {
|
|
/* parameters passed as sequence */
|
|
if (PyTuple_CheckExact(parameters)) {
|
|
num_params = PyTuple_GET_SIZE(parameters);
|
|
} else if (PyList_CheckExact(parameters)) {
|
|
num_params = PyList_GET_SIZE(parameters);
|
|
} else {
|
|
num_params = PySequence_Size(parameters);
|
|
}
|
|
if (num_params != num_params_needed) {
|
|
PyErr_Format(pysqlite_ProgrammingError, "Incorrect number of bindings supplied. The current statement uses %d, and there are %d supplied.",
|
|
num_params_needed, num_params);
|
|
return;
|
|
}
|
|
for (i = 0; i < num_params; i++) {
|
|
if (PyTuple_CheckExact(parameters)) {
|
|
current_param = PyTuple_GET_ITEM(parameters, i);
|
|
Py_XINCREF(current_param);
|
|
} else if (PyList_CheckExact(parameters)) {
|
|
current_param = PyList_GET_ITEM(parameters, i);
|
|
Py_XINCREF(current_param);
|
|
} else {
|
|
current_param = PySequence_GetItem(parameters, i);
|
|
}
|
|
if (!current_param) {
|
|
return;
|
|
}
|
|
|
|
if (!_need_adapt(current_param)) {
|
|
adapted = current_param;
|
|
} else {
|
|
adapted = microprotocols_adapt(current_param, (PyObject*)&pysqlite_PrepareProtocolType, NULL);
|
|
if (adapted) {
|
|
Py_DECREF(current_param);
|
|
} else {
|
|
PyErr_Clear();
|
|
adapted = current_param;
|
|
}
|
|
}
|
|
|
|
rc = pysqlite_statement_bind_parameter(self, i + 1, adapted, allow_8bit_chars);
|
|
Py_DECREF(adapted);
|
|
|
|
if (rc != SQLITE_OK) {
|
|
if (!PyErr_Occurred()) {
|
|
PyErr_Format(pysqlite_InterfaceError, "Error binding parameter %d - probably unsupported type.", i);
|
|
}
|
|
return;
|
|
}
|
|
}
|
|
} else if (PyDict_Check(parameters)) {
|
|
/* parameters passed as dictionary */
|
|
for (i = 1; i <= num_params_needed; i++) {
|
|
Py_BEGIN_ALLOW_THREADS
|
|
binding_name = sqlite3_bind_parameter_name(self->st, i);
|
|
Py_END_ALLOW_THREADS
|
|
if (!binding_name) {
|
|
PyErr_Format(pysqlite_ProgrammingError, "Binding %d has no name, but you supplied a dictionary (which has only names).", i);
|
|
return;
|
|
}
|
|
|
|
binding_name++; /* skip first char (the colon) */
|
|
if (PyDict_CheckExact(parameters)) {
|
|
current_param = PyDict_GetItemString(parameters, binding_name);
|
|
Py_XINCREF(current_param);
|
|
} else {
|
|
current_param = PyMapping_GetItemString(parameters, (char*)binding_name);
|
|
}
|
|
if (!current_param) {
|
|
PyErr_Format(pysqlite_ProgrammingError, "You did not supply a value for binding %d.", i);
|
|
return;
|
|
}
|
|
|
|
if (!_need_adapt(current_param)) {
|
|
adapted = current_param;
|
|
} else {
|
|
adapted = microprotocols_adapt(current_param, (PyObject*)&pysqlite_PrepareProtocolType, NULL);
|
|
if (adapted) {
|
|
Py_DECREF(current_param);
|
|
} else {
|
|
PyErr_Clear();
|
|
adapted = current_param;
|
|
}
|
|
}
|
|
|
|
rc = pysqlite_statement_bind_parameter(self, i, adapted, allow_8bit_chars);
|
|
Py_DECREF(adapted);
|
|
|
|
if (rc != SQLITE_OK) {
|
|
if (!PyErr_Occurred()) {
|
|
PyErr_Format(pysqlite_InterfaceError, "Error binding parameter :%s - probably unsupported type.", binding_name);
|
|
}
|
|
return;
|
|
}
|
|
}
|
|
} else {
|
|
PyErr_SetString(PyExc_ValueError, "parameters are of unsupported type");
|
|
}
|
|
}
|
|
|
|
int pysqlite_statement_recompile(pysqlite_Statement* self, PyObject* params)
|
|
{
|
|
const char* tail;
|
|
int rc;
|
|
const char* sql_cstr;
|
|
Py_ssize_t sql_len;
|
|
sqlite3_stmt* new_st;
|
|
|
|
sql_cstr = PyUnicode_AsStringAndSize(self->sql, &sql_len);
|
|
if (sql_cstr == NULL) {
|
|
rc = PYSQLITE_SQL_WRONG_TYPE;
|
|
return rc;
|
|
}
|
|
|
|
rc = sqlite3_prepare(self->db,
|
|
sql_cstr,
|
|
-1,
|
|
&new_st,
|
|
&tail);
|
|
|
|
if (rc == SQLITE_OK) {
|
|
/* The efficient sqlite3_transfer_bindings is only available in SQLite
|
|
* version 3.2.2 or later. For older SQLite releases, that might not
|
|
* even define SQLITE_VERSION_NUMBER, we do it the manual way.
|
|
*/
|
|
#ifdef SQLITE_VERSION_NUMBER
|
|
#if SQLITE_VERSION_NUMBER >= 3002002
|
|
/* The check for the number of parameters is necessary to not trigger a
|
|
* bug in certain SQLite versions (experienced in 3.2.8 and 3.3.4). */
|
|
if (sqlite3_bind_parameter_count(self->st) > 0) {
|
|
(void)sqlite3_transfer_bindings(self->st, new_st);
|
|
}
|
|
#endif
|
|
#else
|
|
statement_bind_parameters(self, params);
|
|
#endif
|
|
|
|
(void)sqlite3_finalize(self->st);
|
|
self->st = new_st;
|
|
}
|
|
|
|
return rc;
|
|
}
|
|
|
|
int pysqlite_statement_finalize(pysqlite_Statement* self)
|
|
{
|
|
int rc;
|
|
|
|
rc = SQLITE_OK;
|
|
if (self->st) {
|
|
Py_BEGIN_ALLOW_THREADS
|
|
rc = sqlite3_finalize(self->st);
|
|
Py_END_ALLOW_THREADS
|
|
self->st = NULL;
|
|
}
|
|
|
|
self->in_use = 0;
|
|
|
|
return rc;
|
|
}
|
|
|
|
int pysqlite_statement_reset(pysqlite_Statement* self)
|
|
{
|
|
int rc;
|
|
|
|
rc = SQLITE_OK;
|
|
|
|
if (self->in_use && self->st) {
|
|
Py_BEGIN_ALLOW_THREADS
|
|
rc = sqlite3_reset(self->st);
|
|
Py_END_ALLOW_THREADS
|
|
|
|
if (rc == SQLITE_OK) {
|
|
self->in_use = 0;
|
|
}
|
|
}
|
|
|
|
return rc;
|
|
}
|
|
|
|
void pysqlite_statement_mark_dirty(pysqlite_Statement* self)
|
|
{
|
|
self->in_use = 1;
|
|
}
|
|
|
|
void pysqlite_statement_dealloc(pysqlite_Statement* self)
|
|
{
|
|
int rc;
|
|
|
|
if (self->st) {
|
|
Py_BEGIN_ALLOW_THREADS
|
|
rc = sqlite3_finalize(self->st);
|
|
Py_END_ALLOW_THREADS
|
|
}
|
|
|
|
self->st = NULL;
|
|
|
|
Py_XDECREF(self->sql);
|
|
|
|
if (self->in_weakreflist != NULL) {
|
|
PyObject_ClearWeakRefs((PyObject*)self);
|
|
}
|
|
|
|
Py_TYPE(self)->tp_free((PyObject*)self);
|
|
}
|
|
|
|
/*
|
|
* Checks if there is anything left in an SQL string after SQLite compiled it.
|
|
* This is used to check if somebody tried to execute more than one SQL command
|
|
* with one execute()/executemany() command, which the DB-API and we don't
|
|
* allow.
|
|
*
|
|
* Returns 1 if there is more left than should be. 0 if ok.
|
|
*/
|
|
static int pysqlite_check_remaining_sql(const char* tail)
|
|
{
|
|
const char* pos = tail;
|
|
|
|
parse_remaining_sql_state state = NORMAL;
|
|
|
|
for (;;) {
|
|
switch (*pos) {
|
|
case 0:
|
|
return 0;
|
|
case '-':
|
|
if (state == NORMAL) {
|
|
state = LINECOMMENT_1;
|
|
} else if (state == LINECOMMENT_1) {
|
|
state = IN_LINECOMMENT;
|
|
}
|
|
break;
|
|
case ' ':
|
|
case '\t':
|
|
break;
|
|
case '\n':
|
|
case 13:
|
|
if (state == IN_LINECOMMENT) {
|
|
state = NORMAL;
|
|
}
|
|
break;
|
|
case '/':
|
|
if (state == NORMAL) {
|
|
state = COMMENTSTART_1;
|
|
} else if (state == COMMENTEND_1) {
|
|
state = NORMAL;
|
|
} else if (state == COMMENTSTART_1) {
|
|
return 1;
|
|
}
|
|
break;
|
|
case '*':
|
|
if (state == NORMAL) {
|
|
return 1;
|
|
} else if (state == LINECOMMENT_1) {
|
|
return 1;
|
|
} else if (state == COMMENTSTART_1) {
|
|
state = IN_COMMENT;
|
|
} else if (state == IN_COMMENT) {
|
|
state = COMMENTEND_1;
|
|
}
|
|
break;
|
|
default:
|
|
if (state == COMMENTEND_1) {
|
|
state = IN_COMMENT;
|
|
} else if (state == IN_LINECOMMENT) {
|
|
} else if (state == IN_COMMENT) {
|
|
} else {
|
|
return 1;
|
|
}
|
|
}
|
|
|
|
pos++;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
PyTypeObject pysqlite_StatementType = {
|
|
PyVarObject_HEAD_INIT(NULL, 0)
|
|
MODULE_NAME ".Statement", /* tp_name */
|
|
sizeof(pysqlite_Statement), /* tp_basicsize */
|
|
0, /* tp_itemsize */
|
|
(destructor)pysqlite_statement_dealloc, /* tp_dealloc */
|
|
0, /* tp_print */
|
|
0, /* tp_getattr */
|
|
0, /* tp_setattr */
|
|
0, /* tp_compare */
|
|
0, /* tp_repr */
|
|
0, /* tp_as_number */
|
|
0, /* tp_as_sequence */
|
|
0, /* tp_as_mapping */
|
|
0, /* tp_hash */
|
|
0, /* tp_call */
|
|
0, /* tp_str */
|
|
0, /* tp_getattro */
|
|
0, /* tp_setattro */
|
|
0, /* tp_as_buffer */
|
|
Py_TPFLAGS_DEFAULT, /* tp_flags */
|
|
0, /* tp_doc */
|
|
0, /* tp_traverse */
|
|
0, /* tp_clear */
|
|
0, /* tp_richcompare */
|
|
offsetof(pysqlite_Statement, in_weakreflist), /* tp_weaklistoffset */
|
|
0, /* tp_iter */
|
|
0, /* tp_iternext */
|
|
0, /* tp_methods */
|
|
0, /* tp_members */
|
|
0, /* tp_getset */
|
|
0, /* tp_base */
|
|
0, /* tp_dict */
|
|
0, /* tp_descr_get */
|
|
0, /* tp_descr_set */
|
|
0, /* tp_dictoffset */
|
|
(initproc)0, /* tp_init */
|
|
0, /* tp_alloc */
|
|
0, /* tp_new */
|
|
0 /* tp_free */
|
|
};
|
|
|
|
extern int pysqlite_statement_setup_types(void)
|
|
{
|
|
pysqlite_StatementType.tp_new = PyType_GenericNew;
|
|
return PyType_Ready(&pysqlite_StatementType);
|
|
}
|