mirror of
https://github.com/python/cpython.git
synced 2025-07-30 14:44:10 +00:00
0741a60ca7
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.
95 lines
2.9 KiB
C
95 lines
2.9 KiB
C
/* util.c - various utility functions
|
|
*
|
|
* Copyright (C) 2005-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.
|
|
*/
|
|
|
|
#include "module.h"
|
|
#include "connection.h"
|
|
|
|
int _sqlite_step_with_busyhandler(sqlite3_stmt* statement, pysqlite_Connection* connection)
|
|
{
|
|
int rc;
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
rc = sqlite3_step(statement);
|
|
Py_END_ALLOW_THREADS
|
|
|
|
return rc;
|
|
}
|
|
|
|
/**
|
|
* Checks the SQLite error code and sets the appropriate DB-API exception.
|
|
* Returns the error code (0 means no error occurred).
|
|
*/
|
|
int _pysqlite_seterror(sqlite3* db)
|
|
{
|
|
int errorcode;
|
|
|
|
errorcode = sqlite3_errcode(db);
|
|
|
|
switch (errorcode)
|
|
{
|
|
case SQLITE_OK:
|
|
PyErr_Clear();
|
|
break;
|
|
case SQLITE_INTERNAL:
|
|
case SQLITE_NOTFOUND:
|
|
PyErr_SetString(pysqlite_InternalError, sqlite3_errmsg(db));
|
|
break;
|
|
case SQLITE_NOMEM:
|
|
(void)PyErr_NoMemory();
|
|
break;
|
|
case SQLITE_ERROR:
|
|
case SQLITE_PERM:
|
|
case SQLITE_ABORT:
|
|
case SQLITE_BUSY:
|
|
case SQLITE_LOCKED:
|
|
case SQLITE_READONLY:
|
|
case SQLITE_INTERRUPT:
|
|
case SQLITE_IOERR:
|
|
case SQLITE_FULL:
|
|
case SQLITE_CANTOPEN:
|
|
case SQLITE_PROTOCOL:
|
|
case SQLITE_EMPTY:
|
|
case SQLITE_SCHEMA:
|
|
PyErr_SetString(pysqlite_OperationalError, sqlite3_errmsg(db));
|
|
break;
|
|
case SQLITE_CORRUPT:
|
|
PyErr_SetString(pysqlite_DatabaseError, sqlite3_errmsg(db));
|
|
break;
|
|
case SQLITE_TOOBIG:
|
|
PyErr_SetString(pysqlite_DataError, sqlite3_errmsg(db));
|
|
break;
|
|
case SQLITE_CONSTRAINT:
|
|
case SQLITE_MISMATCH:
|
|
PyErr_SetString(pysqlite_IntegrityError, sqlite3_errmsg(db));
|
|
break;
|
|
case SQLITE_MISUSE:
|
|
PyErr_SetString(pysqlite_ProgrammingError, sqlite3_errmsg(db));
|
|
break;
|
|
default:
|
|
PyErr_SetString(pysqlite_DatabaseError, sqlite3_errmsg(db));
|
|
break;
|
|
}
|
|
|
|
return errorcode;
|
|
}
|
|
|