Speculative checkin (requires approval of Gerhard Haering)

nnorwitz · nnorwitz · commit fe7d0c3bc635 · 2006-06-15T04:54:29.000Z
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.
diff --git a/Lib/sqlite3/test/hooks.py b/Lib/sqlite3/test/hooks.py
@@ -48,8 +48,6 @@ def CheckCreateCollationNotAscii(self):
             pass
 
     def CheckCollationIsUsed(self):
-        if sqlite.version_info < (3, 2, 1):     # old SQLite versions crash on this test
-            return
         def mycoll(x, y):
             # reverse order
             return -cmp(x, y)
diff --git a/Lib/sqlite3/test/userfunctions.py b/Lib/sqlite3/test/userfunctions.py
@@ -200,8 +200,6 @@ def CheckFuncReturnBlob(self):
         self.failUnlessEqual(val, buffer("blob"))
 
     def CheckFuncException(self):
-        if sqlite.version_info < (3, 3, 3):     # don't raise bug in earlier SQLite versions
-            return
         cur = self.con.cursor()
         try:
             cur.execute("select raiseexception()")
@@ -285,8 +283,6 @@ def CheckAggrNoStep(self):
             self.failUnlessEqual(e.args[0], "AggrNoStep instance has no attribute 'step'")
 
     def CheckAggrNoFinalize(self):
-        if sqlite.version_info < (3, 3, 3):     # don't raise bug in earlier SQLite versions
-            return
         cur = self.con.cursor()
         try:
             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")
 
     def CheckAggrExceptionInInit(self):
-        if sqlite.version_info < (3, 3, 3):     # don't raise bug in earlier SQLite versions
-            return
         cur = self.con.cursor()
         try:
             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")
 
     def CheckAggrExceptionInStep(self):
-        if sqlite.version_info < (3, 3, 3):     # don't raise bug in earlier SQLite versions
-            return
         cur = self.con.cursor()
         try:
             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")
 
     def CheckAggrExceptionInFinalize(self):
-        if sqlite.version_info < (3, 3, 3):     # don't raise bug in earlier SQLite versions
-            return
         cur = self.con.cursor()
         try:
             cur.execute("select excFinalize(t) from test")
diff --git 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
 }
 

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,8 @@ void _sqlite3_result_error(sqlite3_context* ctx, const char* errmsg, int len)`
`42`	`42`	`* segfaults, depending on the SQLite version */`
`43`	`43`	`#if SQLITE_VERSION_NUMBER >= 3003003`
`44`	`44`	`sqlite3_result_error(ctx, errmsg, len);`
	`45`	`+#else`
	`46`	`+ PyErr_SetString(OperationalError, errmsg);`
`45`	`47`	`#endif`
`46`	`48`	`}`
`47`	`49`