summaryrefslogtreecommitdiffstats
path: root/Modules/_sqlite
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2006-06-15 04:54:29 (GMT)
committerNeal Norwitz <nnorwitz@gmail.com>2006-06-15 04:54:29 (GMT)
commitfe7d0c3bc6352bbabd4b458bf736cd18e9082a27 (patch)
treec5a985fb771c7a4f5cb943dd2b3f145922bef7f4 /Modules/_sqlite
parent5d538b603f733cd747ce5a776d86fd971012c986 (diff)
downloadcpython-fe7d0c3bc6352bbabd4b458bf736cd18e9082a27.zip
cpython-fe7d0c3bc6352bbabd4b458bf736cd18e9082a27.tar.gz
cpython-fe7d0c3bc6352bbabd4b458bf736cd18e9082a27.tar.bz2
Speculative checkin (requires approval of Gerhard Haering)
This backs out the test changes in 46962 which prevented crashes by not running the tests via a version check. All the version checks added in that rev were removed from the tests. Code was added to the error handler in connection.c that seems to work with older versions of sqlite including 3.1.3.
Diffstat (limited to 'Modules/_sqlite')
-rw-r--r--Modules/_sqlite/connection.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
index f63d88c..ca7aad8 100644
--- a/Modules/_sqlite/connection.c
+++ b/Modules/_sqlite/connection.c
@@ -42,6 +42,8 @@ void _sqlite3_result_error(sqlite3_context* ctx, const char* errmsg, int len)
* segfaults, depending on the SQLite version */
#if SQLITE_VERSION_NUMBER >= 3003003
sqlite3_result_error(ctx, errmsg, len);
+#else
+ PyErr_SetString(OperationalError, errmsg);
#endif
}