HackBase/python-cx_Oracle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert changes to return decimal numbers when the numeric precision was too

Browse Source 
great to be returned accurately as a floating point number. This change had too
great an impact on existing functionality and an output type handler can be
used to return decimal numbers where that is desirable
(https://github.com/oracle/python-cx_Oracle/issues/279).
This commit is contained in:
Anthony Tuininga 2019-03-12 09:31:38 -06:00
parent 8789c6d2a0
commit c112af35cb
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/cxoTransform.c
View File

@ -717,14 +717,12 @@ PyObject *cxoTransform_toPython(cxoTransformNum transformNum,
#endif #endif
Py_DECREF(stringObj); Py_DECREF(stringObj);
return result; return result;
} else if (transformNum != CXO_TRANSFORM_DECIMAL && } else if (transformNum == CXO_TRANSFORM_DECIMAL) {
bytes->length <= 15) { result = PyObject_CallFunctionObjArgs(
(PyObject*) cxoPyTypeDecimal, stringObj, NULL);
} else {
result = PyNumber_Float(stringObj); result = PyNumber_Float(stringObj);
Py_DECREF(stringObj);
return result;
} }
result = PyObject_CallFunctionObjArgs(
(PyObject*) cxoPyTypeDecimal, stringObj, NULL);
Py_DECREF(stringObj); Py_DECREF(stringObj);
return result; return result;
case CXO_TRANSFORM_OBJECT: case CXO_TRANSFORM_OBJECT:

6
test/NumberVar.py
View File

@ -321,7 +321,7 @@ class TestCase(TestEnv.BaseTestCase):
decimal.Decimal("-9.99999999999999e+125"), 0.0, 1e-130, decimal.Decimal("-9.99999999999999e+125"), 0.0, 1e-130,
-1e-130] -1e-130]
outValues = [int("9" * 15 + "0" * 111), -int("9" * 15 + "0" * 111), outValues = [int("9" * 15 + "0" * 111), -int("9" * 15 + "0" * 111),
0, decimal.Decimal("1e-130"), decimal.Decimal("-1e-130")] 0, 1e-130, -1e-130]
for inValue, outValue in zip(inValues, outValues): for inValue, outValue in zip(inValues, outValues):
self.cursor.execute("select :1 from dual", (inValue,)) self.cursor.execute("select :1 from dual", (inValue,))
result, = self.cursor.fetchone() result, = self.cursor.fetchone()
@ -351,8 +351,8 @@ class TestCase(TestEnv.BaseTestCase):
from TestNumbers from TestNumbers
where IntCol = 1""") where IntCol = 1""")
result, = self.cursor.fetchone() result, = self.cursor.fetchone()
self.assertAlmostEqual(result, self.assertEqual(result, 1.0 / 7.0)
decimal.Decimal("1") / decimal.Decimal("7")) self.assertTrue(isinstance(result, float), "float not returned")
def testStringFormat(self): def testStringFormat(self):
"test that string format is returned properly" "test that string format is returned properly"