On Windows, sizeof(long) = 4 which means that integers between 10 and 18 digits

were not converted to Python correctly
(#70).

Author: anthony-tuininga

src/Variable.c

@@ -123,6 +123,7 @@ static PyMethodDef g_VariableMethods[] = {
 //-----------------------------------------------------------------------------
 static udt_VariableType *VarType_FromDataTypeInfo(dpiDataTypeInfo *info)
 {
+    static int maxLongSafeDigits = sizeof(long) >= 8 ? 18 : 9;
     char message[120];
 
     switch (info->oracleTypeNum) {
@@ -145,7 +146,7 @@ static udt_VariableType *VarType_FromDataTypeInfo(dpiDataTypeInfo *info)
             if (info->scale == 0 ||
                     (info->scale == -127 && info->precision == 0)) {
                 if (info->precision > 0 &&
-                        info->precision <= DPI_MAX_INT64_PRECISION)
+                        info->precision <= maxLongSafeDigits)
                     return &vt_NumberAsInteger;
                 return &vt_NumberAsLongInteger;
             }

test/NumberVar.py

@@ -25,20 +25,21 @@ def outputTypeHandlerDecimal(self, cursor, name, defaultType, size,
                     arraysize = cursor.arraysize)
 
     def setUp(self):
-      BaseTestCase.setUp(self)
-      self.rawData = []
-      self.dataByKey = {}
-      for i in range(1, 11):
-          numberCol = i + i * 0.25
-          floatCol = i + i * 0.75
-          unconstrainedCol = i ** 3 + i * 0.5
-          if i % 2:
-              nullableCol = long(143) ** i
-          else:
-              nullableCol = None
-          dataTuple = (i, numberCol, floatCol, unconstrainedCol, nullableCol)
-          self.rawData.append(dataTuple)
-          self.dataByKey[i] = dataTuple
+        BaseTestCase.setUp(self)
+        self.rawData = []
+        self.dataByKey = {}
+        for i in range(1, 11):
+            numberCol = i + i * 0.25
+            floatCol = i + i * 0.75
+            unconstrainedCol = i ** 3 + i * 0.5
+            if i % 2:
+                nullableCol = long(143) ** i
+            else:
+                nullableCol = None
+            dataTuple = (i, long(38) ** i, numberCol, floatCol,
+                    unconstrainedCol, nullableCol)
+            self.rawData.append(dataTuple)
+            self.dataByKey[i] = dataTuple
 
     def testBindBoolean(self):
         "test binding in a boolean"
@@ -131,7 +132,7 @@ def testBindNull(self):
     def testBindNumberArrayDirect(self):
         "test binding in a number array"
         returnValue = self.cursor.var(cx_Oracle.NUMBER)
-        array = [r[1] for r in self.rawData]
+        array = [r[2] for r in self.rawData]
         statement = """
                 begin
                   :returnValue := pkg_TestNumberArrays.TestInArrays(
@@ -152,7 +153,7 @@ def testBindNumberArrayBySizes(self):
         "test binding in a number array (with setinputsizes)"
         returnValue = self.cursor.var(cx_Oracle.NUMBER)
         self.cursor.setinputsizes(array = [cx_Oracle.NUMBER, 10])
-        array = [r[1] for r in self.rawData]
+        array = [r[2] for r in self.rawData]
         self.cursor.execute("""
                 begin
                   :returnValue := pkg_TestNumberArrays.TestInArrays(
@@ -167,8 +168,7 @@ def testBindNumberArrayByVar(self):
         "test binding in a number array (with arrayvar)"
         returnValue = self.cursor.var(cx_Oracle.NUMBER)
         array = self.cursor.arrayvar(cx_Oracle.NUMBER,
-                [r[1] for r in self.rawData])
-        array.setvalue(0, [r[1] for r in self.rawData])
+                [r[2] for r in self.rawData])
         self.cursor.execute("""
                 begin
                   :returnValue := pkg_TestNumberArrays.TestInArrays(
@@ -197,7 +197,7 @@ def testBindZeroLengthNumberArrayByVar(self):
     def testBindInOutNumberArrayByVar(self):
         "test binding in/out a number array (with arrayvar)"
         array = self.cursor.arrayvar(cx_Oracle.NUMBER, 10)
-        originalData = [r[1] for r in self.rawData]
+        originalData = [r[2] for r in self.rawData]
         expectedData = [originalData[i - 1] * 10 for i in range(1, 6)] + \
                 originalData[5:]
         array.setvalue(0, originalData)
@@ -266,6 +266,7 @@ def testCursorDescription(self):
         self.cursor.execute("select * from TestNumbers")
         self.assertEqual(self.cursor.description,
                 [ ('INTCOL', cx_Oracle.NUMBER, 10, None, 9, 0, 0),
+                  ('LONGINTCOL', cx_Oracle.NUMBER, 17, None, 16, 0, 0),
                   ('NUMBERCOL', cx_Oracle.NUMBER, 13, None, 9, 2, 0),
                   ('FLOATCOL', cx_Oracle.NUMBER, 127, None, 126, -127, 0),
                   ('UNCONSTRAINEDCOL', cx_Oracle.NUMBER, 127, None, 0, -127, 0),

test/sql/SetupTest.sql

@@ -95,6 +95,7 @@ create or replace type &main_user..udt_Building as object (
 -- create tables
 create table &main_user..TestNumbers (
     IntCol                              number(9) not null,
+    LongIntCol                          number(16) not null,
     NumberCol                           number(9, 2) not null,
     FloatCol                            float not null,
     UnconstrainedCol                    number not null,
@@ -199,7 +200,7 @@ create table &main_user..TestBuildings (
 begin
     for i in 1..10 loop
         insert into &main_user..TestNumbers
-        values (i, i + i * 0.25, i + i * .75, i * i * i + i *.5,
+        values (i, power(38, i), i + i * 0.25, i + i * .75, i * i * i + i *.5,
                 decode(mod(i, 2), 0, null, power(143, i)));
     end loop;
 end;