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

Consolidate string handling in cxoTransform_toPython (#419)

Browse Source 
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
This commit is contained in:
Alex Henrie 2020-04-17 09:57:26 -06:00 committed by GitHub
parent 6dc0263f1f
commit 5ad2408a11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/cxoTransform.c
View File

@ -814,8 +814,11 @@ PyObject *cxoTransform_toPython(cxoTransformNum transformNum,
timestamp->month, timestamp->day, timestamp->hour,
timestamp->minute, timestamp->second,
timestamp->fsecond / 1000);
case CXO_TRANSFORM_FIXED_CHAR:
case CXO_TRANSFORM_FIXED_NCHAR:
case CXO_TRANSFORM_LONG_STRING:
case CXO_TRANSFORM_NSTRING:
case CXO_TRANSFORM_STRING:
bytes = &dbValue->asBytes;
return PyUnicode_Decode(bytes->ptr, bytes->length, bytes->encoding,
encodingErrors);
@ -854,12 +857,6 @@ PyObject *cxoTransform_toPython(cxoTransformNum transformNum,
return cxoError_raiseAndReturnNull();
return PyUnicode_Decode(rowid, rowidLength,
connection->encodingInfo.encoding, NULL);
case CXO_TRANSFORM_FIXED_CHAR:
case CXO_TRANSFORM_STRING:
case CXO_TRANSFORM_LONG_STRING:
bytes = &dbValue->asBytes;
return PyUnicode_Decode(bytes->ptr, bytes->length,
bytes->encoding, encodingErrors);
case CXO_TRANSFORM_TIMEDELTA:
intervalDS = &dbValue->asIntervalDS;
seconds = intervalDS->hours * 60 * 60 + intervalDS->minutes * 60 +