mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Neal Norwitz 2006-06-15 04:54:29 +00:00
parent 5d538b603f
commit fe7d0c3bc6
3 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/sqlite3/test/hooks.py
View File

@ -48,8 +48,6 @@ def CheckCreateCollationNotAscii(self):
pass pass
def CheckCollationIsUsed(self): def CheckCollationIsUsed(self):
if sqlite.version_info < (3, 2, 1): # old SQLite versions crash on this test
return
def mycoll(x, y): def mycoll(x, y):
# reverse order # reverse order
return -cmp(x, y) return -cmp(x, y)

10
Lib/sqlite3/test/userfunctions.py
View File

@ -200,8 +200,6 @@ def CheckFuncReturnBlob(self):
self.failUnlessEqual(val, buffer("blob")) self.failUnlessEqual(val, buffer("blob"))
def CheckFuncException(self): def CheckFuncException(self):
if sqlite.version_info < (3, 3, 3): # don't raise bug in earlier SQLite versions
return
cur = self.con.cursor() cur = self.con.cursor()
try: try:
cur.execute("select raiseexception()") cur.execute("select raiseexception()")
@ -285,8 +283,6 @@ def CheckAggrNoStep(self):
self.failUnlessEqual(e.args[0], "AggrNoStep instance has no attribute 'step'") self.failUnlessEqual(e.args[0], "AggrNoStep instance has no attribute 'step'")
def CheckAggrNoFinalize(self): def CheckAggrNoFinalize(self):
if sqlite.version_info < (3, 3, 3): # don't raise bug in earlier SQLite versions
return
cur = self.con.cursor() cur = self.con.cursor()
try: try:
cur.execute("select nofinalize(t) from test") cur.execute("select nofinalize(t) from test")
@ -296,8 +292,6 @@ def CheckAggrNoFinalize(self):
self.failUnlessEqual(e.args[0], "user-defined aggregate's 'finalize' method raised error") self.failUnlessEqual(e.args[0], "user-defined aggregate's 'finalize' method raised error")
def CheckAggrExceptionInInit(self): def CheckAggrExceptionInInit(self):
if sqlite.version_info < (3, 3, 3): # don't raise bug in earlier SQLite versions
return
cur = self.con.cursor() cur = self.con.cursor()
try: try:
cur.execute("select excInit(t) from test") cur.execute("select excInit(t) from test")
@ -307,8 +301,6 @@ def CheckAggrExceptionInInit(self):
self.failUnlessEqual(e.args[0], "user-defined aggregate's '__init__' method raised error") self.failUnlessEqual(e.args[0], "user-defined aggregate's '__init__' method raised error")
def CheckAggrExceptionInStep(self): def CheckAggrExceptionInStep(self):
if sqlite.version_info < (3, 3, 3): # don't raise bug in earlier SQLite versions
return
cur = self.con.cursor() cur = self.con.cursor()
try: try:
cur.execute("select excStep(t) from test") cur.execute("select excStep(t) from test")
@ -318,8 +310,6 @@ def CheckAggrExceptionInStep(self):
self.failUnlessEqual(e.args[0], "user-defined aggregate's 'step' method raised error") self.failUnlessEqual(e.args[0], "user-defined aggregate's 'step' method raised error")
def CheckAggrExceptionInFinalize(self): def CheckAggrExceptionInFinalize(self):
if sqlite.version_info < (3, 3, 3): # don't raise bug in earlier SQLite versions
return
cur = self.con.cursor() cur = self.con.cursor()
try: try:
cur.execute("select excFinalize(t) from test") cur.execute("select excFinalize(t) from test")

2
Modules/_sqlite/connection.c
View File

@ -42,6 +42,8 @@ void _sqlite3_result_error(sqlite3_context* ctx, const char* errmsg, int len)
* segfaults, depending on the SQLite version */ * segfaults, depending on the SQLite version */
#if SQLITE_VERSION_NUMBER >= 3003003 #if SQLITE_VERSION_NUMBER >= 3003003
sqlite3_result_error(ctx, errmsg, len); sqlite3_result_error(ctx, errmsg, len);
#else
PyErr_SetString(OperationalError, errmsg);
#endif #endif
} }