sqlite3: Fix 64-bit integer handling in user functions on 32-bit architectures
Closes #8033.
diff --git a/Lib/sqlite3/test/userfunctions.py b/Lib/sqlite3/test/userfunctions.py
index 80b6f0c..2db3a61 100644
--- a/Lib/sqlite3/test/userfunctions.py
+++ b/Lib/sqlite3/test/userfunctions.py
@@ -37,6 +37,8 @@
return None
def func_returnblob():
return buffer("blob")
+def func_returnlonglong():
+ return 1<<31
def func_raiseexception():
5 // 0
@@ -50,6 +52,8 @@
return type(v) is type(None)
def func_isblob(v):
return type(v) is buffer
+def func_islonglong(v):
+ return isinstance(v, (int, long)) and v >= 1<<31
class AggrNoStep:
def __init__(self):
@@ -126,6 +130,7 @@
self.con.create_function("returnfloat", 0, func_returnfloat)
self.con.create_function("returnnull", 0, func_returnnull)
self.con.create_function("returnblob", 0, func_returnblob)
+ self.con.create_function("returnlonglong", 0, func_returnlonglong)
self.con.create_function("raiseexception", 0, func_raiseexception)
self.con.create_function("isstring", 1, func_isstring)
@@ -133,6 +138,7 @@
self.con.create_function("isfloat", 1, func_isfloat)
self.con.create_function("isnone", 1, func_isnone)
self.con.create_function("isblob", 1, func_isblob)
+ self.con.create_function("islonglong", 1, func_islonglong)
def tearDown(self):
self.con.close()
@@ -199,6 +205,12 @@
self.assertEqual(type(val), buffer)
self.assertEqual(val, buffer("blob"))
+ def CheckFuncReturnLongLong(self):
+ cur = self.con.cursor()
+ cur.execute("select returnlonglong()")
+ val = cur.fetchone()[0]
+ self.assertEqual(val, 1<<31)
+
def CheckFuncException(self):
cur = self.con.cursor()
try:
@@ -238,6 +250,12 @@
val = cur.fetchone()[0]
self.assertEqual(val, 1)
+ def CheckParamLongLong(self):
+ cur = self.con.cursor()
+ cur.execute("select islonglong(?)", (1<<42,))
+ val = cur.fetchone()[0]
+ self.assertEqual(val, 1)
+
class AggregateTests(unittest.TestCase):
def setUp(self):
self.con = sqlite.connect(":memory:")