mirror of
https://github.com/python/cpython.git
synced 2024-12-01 03:01:36 +01:00
fc7bb8c786
svn+ssh://pythondev@svn.python.org/python/trunk ........ r53304 | vinay.sajip | 2007-01-09 15:50:28 +0100 (Tue, 09 Jan 2007) | 1 line Bug #1627575: Added _open() method to FileHandler which can be used to reopen files. The FileHandler instance now saves the encoding (which can be None) in an attribute called "encoding". ........ r53305 | vinay.sajip | 2007-01-09 15:51:36 +0100 (Tue, 09 Jan 2007) | 1 line Added entry about addition of _open() method to logging.FileHandler. ........ r53306 | vinay.sajip | 2007-01-09 15:54:56 +0100 (Tue, 09 Jan 2007) | 1 line Added a docstring ........ r53316 | thomas.heller | 2007-01-09 20:19:33 +0100 (Tue, 09 Jan 2007) | 4 lines Verify the sizes of the basic ctypes data types against the struct module. Will backport to release25-maint. ........ r53340 | gustavo.niemeyer | 2007-01-10 17:13:40 +0100 (Wed, 10 Jan 2007) | 3 lines Mention in the int() docstring that a base zero has meaning, as stated in http://docs.python.org/lib/built-in-funcs.html as well. ........ r53341 | gustavo.niemeyer | 2007-01-10 17:15:48 +0100 (Wed, 10 Jan 2007) | 2 lines Minor change in int() docstring for proper spacing. ........ r53358 | thomas.heller | 2007-01-10 21:12:13 +0100 (Wed, 10 Jan 2007) | 1 line Change the ctypes version number to "1.1.0". ........ r53361 | thomas.heller | 2007-01-10 21:51:19 +0100 (Wed, 10 Jan 2007) | 1 line Must change the version number in the _ctypes extension as well. ........ r53362 | guido.van.rossum | 2007-01-11 00:12:56 +0100 (Thu, 11 Jan 2007) | 3 lines Fix the signature of log_error(). (A subclass that did the right thing was getting complaints from pychecker.) ........ r53370 | matthias.klose | 2007-01-11 11:26:31 +0100 (Thu, 11 Jan 2007) | 2 lines - Make the documentation match the code and the docstring ........ r53375 | matthias.klose | 2007-01-11 12:44:04 +0100 (Thu, 11 Jan 2007) | 2 lines - idle: Honor the "Cancel" action in the save dialog (Debian bug #299092). ........ r53381 | raymond.hettinger | 2007-01-11 19:22:55 +0100 (Thu, 11 Jan 2007) | 1 line SF #1486663 -- Allow keyword args in subclasses of set() and frozenset(). ........ r53388 | thomas.heller | 2007-01-11 22:18:56 +0100 (Thu, 11 Jan 2007) | 4 lines Fixes for 64-bit Windows: In ctypes.wintypes, correct the definitions of HANDLE, WPARAM, LPARAM data types. Make parameterless foreign function calls work. ........ r53390 | thomas.heller | 2007-01-11 22:23:12 +0100 (Thu, 11 Jan 2007) | 2 lines Correct the comments: the code is right. ........ r53393 | brett.cannon | 2007-01-12 08:27:52 +0100 (Fri, 12 Jan 2007) | 3 lines Fix error where the end of a funcdesc environment was accidentally moved too far down. ........ r53397 | anthony.baxter | 2007-01-12 10:35:56 +0100 (Fri, 12 Jan 2007) | 3 lines add parsetok.h as a dependency - previously, changing this file doesn't cause the right files to be rebuilt. ........ r53401 | thomas.heller | 2007-01-12 21:08:19 +0100 (Fri, 12 Jan 2007) | 3 lines Avoid warnings in the test suite because ctypes.wintypes cannot be imported on non-windows systems. ........ r53402 | thomas.heller | 2007-01-12 21:17:34 +0100 (Fri, 12 Jan 2007) | 6 lines patch #1610795: BSD version of ctypes.util.find_library, by Martin Kammerhofer. release25-maint backport candidate, but the release manager has to decide. ........ r53403 | thomas.heller | 2007-01-12 21:21:53 +0100 (Fri, 12 Jan 2007) | 3 lines patch #1610795: BSD version of ctypes.util.find_library, by Martin Kammerhofer. ........ r53406 | brett.cannon | 2007-01-13 01:29:49 +0100 (Sat, 13 Jan 2007) | 2 lines Deprecate the sets module. ........ r53407 | georg.brandl | 2007-01-13 13:31:51 +0100 (Sat, 13 Jan 2007) | 3 lines Fix typo. ........ r53409 | marc-andre.lemburg | 2007-01-13 22:00:08 +0100 (Sat, 13 Jan 2007) | 16 lines Bump version number and change copyright year. Add new API linux_distribution() which supports reading the full distribution name and also knows how to parse LSB-style release files. Redirect the old dist() API to the new API (using the short distribution name taken from the release file filename). Add branch and revision to _sys_version(). Add work-around for Cygwin to libc_ver(). Add support for IronPython (thanks for Anthony Baxter) and make Jython support more robust. ........ r53410 | neal.norwitz | 2007-01-13 22:22:37 +0100 (Sat, 13 Jan 2007) | 1 line Fix grammar in docstrings ........ r53411 | marc-andre.lemburg | 2007-01-13 23:32:21 +0100 (Sat, 13 Jan 2007) | 9 lines Add parameter sys_version to _sys_version(). Change the cache for _sys_version() to take the parameter into account. Add support for parsing the IronPython 1.0.1 sys.version value - even though it still returns '1.0.0'; the version string no longer includes the patch level. ........ r53412 | peter.astrand | 2007-01-13 23:35:35 +0100 (Sat, 13 Jan 2007) | 1 line Fix for bug #1634343: allow specifying empty arguments on Windows ........ r53414 | marc-andre.lemburg | 2007-01-13 23:59:36 +0100 (Sat, 13 Jan 2007) | 14 lines Add Python implementation to the machine details. Pretty-print the Python version used for running PyBench. Let the user know when calibration has finished. [ 1563844 ] pybench support for IronPython: Simplify Unicode version detection. Make garbage collection and check interval settings optional if the Python implementation doesn't support thess (e.g. IronPython). ........ r53415 | marc-andre.lemburg | 2007-01-14 00:13:54 +0100 (Sun, 14 Jan 2007) | 5 lines Use defaults if sys.executable isn't set (e.g. on Jython). This change allows running PyBench under Jython. ........ r53416 | marc-andre.lemburg | 2007-01-14 00:15:33 +0100 (Sun, 14 Jan 2007) | 3 lines Jython doesn't have sys.setcheckinterval() - ignore it in that case. ........ r53420 | gerhard.haering | 2007-01-14 02:43:50 +0100 (Sun, 14 Jan 2007) | 29 lines Merged changes from standalone version 2.3.3. This should probably all be merged into the 2.5 maintenance branch: - self->statement was not checked while fetching data, which could lead to crashes if you used the pysqlite API in unusual ways. Closing the cursor and continuing to fetch data was enough. - Converters are stored in a converters dictionary. The converter name is uppercased first. The old upper-casing algorithm was wrong and was replaced by a simple call to the Python string's upper() method instead. -Applied patch by Glyph Lefkowitz that fixes the problem with subsequent SQLITE_SCHEMA errors. - Improvement to the row type: rows can now be iterated over and have a keys() method. This improves compatibility with both tuple and dict a lot. - A bugfix for the subsecond resolution in timestamps. - Corrected the way the flags PARSE_DECLTYPES and PARSE_COLNAMES are checked for. Now they work as documented. - gcc on Linux sucks. It exports all symbols by default in shared libraries, so if symbols are not unique it can lead to problems with symbol lookup. pysqlite used to crash under Apache when mod_cache was enabled because both modules had the symbol cache_init. I fixed this by applying the prefix pysqlite_ almost everywhere. Sigh. ........ r53423 | guido.van.rossum | 2007-01-14 04:46:33 +0100 (Sun, 14 Jan 2007) | 2 lines Remove a dependency of this test on $COLUMNS. ........ r53425 | ka-ping.yee | 2007-01-14 05:25:15 +0100 (Sun, 14 Jan 2007) | 3 lines Handle old-style instances more gracefully (display documentation on the relevant class instead of documentation on <type 'instance'>). ........ r53440 | vinay.sajip | 2007-01-14 22:49:59 +0100 (Sun, 14 Jan 2007) | 1 line Added WatchedFileHandler (based on SF patch #1598415) ........ r53441 | vinay.sajip | 2007-01-14 22:50:50 +0100 (Sun, 14 Jan 2007) | 1 line Added documentation for WatchedFileHandler (based on SF patch #1598415) ........ r53442 | guido.van.rossum | 2007-01-15 01:02:35 +0100 (Mon, 15 Jan 2007) | 2 lines Doc patch matching r53434 (htonl etc. now always take/return positive ints). ........
129 lines
4.7 KiB
C
129 lines
4.7 KiB
C
/* connection.h - definitions for the connection type
|
|
*
|
|
* Copyright (C) 2004-2006 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.
|
|
*/
|
|
|
|
#ifndef PYSQLITE_CONNECTION_H
|
|
#define PYSQLITE_CONNECTION_H
|
|
#include "Python.h"
|
|
#include "pythread.h"
|
|
#include "structmember.h"
|
|
|
|
#include "cache.h"
|
|
#include "module.h"
|
|
|
|
#include "sqlite3.h"
|
|
|
|
typedef struct
|
|
{
|
|
PyObject_HEAD
|
|
sqlite3* db;
|
|
|
|
/* 1 if we are currently within a transaction, i. e. if a BEGIN has been
|
|
* issued */
|
|
int inTransaction;
|
|
|
|
/* the type detection mode. Only 0, PARSE_DECLTYPES, PARSE_COLNAMES or a
|
|
* bitwise combination thereof makes sense */
|
|
int detect_types;
|
|
|
|
/* the timeout value in seconds for database locks */
|
|
double timeout;
|
|
|
|
/* for internal use in the timeout handler: when did the timeout handler
|
|
* first get called with count=0? */
|
|
double timeout_started;
|
|
|
|
/* None for autocommit, otherwise a PyString with the isolation level */
|
|
PyObject* isolation_level;
|
|
|
|
/* NULL for autocommit, otherwise a string with the BEGIN statment; will be
|
|
* freed in connection destructor */
|
|
char* begin_statement;
|
|
|
|
/* 1 if a check should be performed for each API call if the connection is
|
|
* used from the same thread it was created in */
|
|
int check_same_thread;
|
|
|
|
/* thread identification of the thread the connection was created in */
|
|
long thread_ident;
|
|
|
|
pysqlite_Cache* statement_cache;
|
|
|
|
/* A list of weak references to statements used within this connection */
|
|
PyObject* statements;
|
|
|
|
/* a counter for how many statements were created in the connection. May be
|
|
* reset to 0 at certain intervals */
|
|
int created_statements;
|
|
|
|
PyObject* row_factory;
|
|
|
|
/* Determines how bytestrings from SQLite are converted to Python objects:
|
|
* - PyUnicode_Type: Python Unicode objects are constructed from UTF-8 bytestrings
|
|
* - OptimizedUnicode: Like before, but for ASCII data, only PyStrings are created.
|
|
* - PyString_Type: PyStrings are created as-is.
|
|
* - Any custom callable: Any object returned from the callable called with the bytestring
|
|
* as single parameter.
|
|
*/
|
|
PyObject* text_factory;
|
|
|
|
/* remember references to functions/classes used in
|
|
* create_function/create/aggregate, use these as dictionary keys, so we
|
|
* can keep the total system refcount constant by clearing that dictionary
|
|
* in connection_dealloc */
|
|
PyObject* function_pinboard;
|
|
|
|
/* a dictionary of registered collation name => collation callable mappings */
|
|
PyObject* collations;
|
|
|
|
/* Exception objects */
|
|
PyObject* Warning;
|
|
PyObject* Error;
|
|
PyObject* InterfaceError;
|
|
PyObject* DatabaseError;
|
|
PyObject* DataError;
|
|
PyObject* OperationalError;
|
|
PyObject* IntegrityError;
|
|
PyObject* InternalError;
|
|
PyObject* ProgrammingError;
|
|
PyObject* NotSupportedError;
|
|
} pysqlite_Connection;
|
|
|
|
extern PyTypeObject pysqlite_ConnectionType;
|
|
|
|
PyObject* pysqlite_connection_alloc(PyTypeObject* type, int aware);
|
|
void pysqlite_connection_dealloc(pysqlite_Connection* self);
|
|
PyObject* pysqlite_connection_cursor(pysqlite_Connection* self, PyObject* args, PyObject* kwargs);
|
|
PyObject* pysqlite_connection_close(pysqlite_Connection* self, PyObject* args);
|
|
PyObject* _pysqlite_connection_begin(pysqlite_Connection* self);
|
|
PyObject* pysqlite_connection_commit(pysqlite_Connection* self, PyObject* args);
|
|
PyObject* pysqlite_connection_rollback(pysqlite_Connection* self, PyObject* args);
|
|
PyObject* pysqlite_connection_new(PyTypeObject* type, PyObject* args, PyObject* kw);
|
|
int pysqlite_connection_init(pysqlite_Connection* self, PyObject* args, PyObject* kwargs);
|
|
|
|
int pysqlite_check_thread(pysqlite_Connection* self);
|
|
int pysqlite_check_connection(pysqlite_Connection* con);
|
|
|
|
int pysqlite_connection_setup_types(void);
|
|
|
|
#endif
|