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

Ensure that the number of elements in the array is not lost when the buffer

Browse Source 
size is increased to accommodate larger strings.
This commit is contained in:
Anthony Tuininga 2018-02-16 16:23:09 -07:00
parent ecb6ee4442
commit 46e3aff3fa
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/cxoVar.c
View File

@ -486,8 +486,8 @@ static int cxoVar_setValueBytes(cxoVar *var, uint32_t pos, dpiData *data,
dpiData *tempVarData, *sourceData;
dpiOracleTypeNum oracleTypeNum;
dpiNativeTypeNum nativeTypeNum;
uint32_t i, numElements;
dpiVar *tempVarHandle;
uint32_t i;
int status;
if (buffer->size > var->bufferSize) {
@ -497,6 +497,18 @@ static int cxoVar_setValueBytes(cxoVar *var, uint32_t pos, dpiData *data,
nativeTypeNum, var->allocatedElements, buffer->size, 0,
var->isArray, NULL, &tempVarHandle, &tempVarData) < 0)
return cxoError_raiseAndReturnInt();
if (var->isArray) {
if (dpiVar_getNumElementsInArray(var->handle, &numElements) < 0) {
cxoError_raiseAndReturnInt();
dpiVar_release(tempVarHandle);
return -1;
}
if (dpiVar_setNumElementsInArray(tempVarHandle, numElements) < 0) {
cxoError_raiseAndReturnInt();
dpiVar_release(tempVarHandle);
return -1;
}
}
for (i = 0; i < var->allocatedElements; i++) {
sourceData = &var->data[i];
if (i == pos || sourceData->isNull)
@ -504,8 +516,9 @@ static int cxoVar_setValueBytes(cxoVar *var, uint32_t pos, dpiData *data,
if (dpiVar_setFromBytes(tempVarHandle, i,
sourceData->value.asBytes.ptr,
sourceData->value.asBytes.length) < 0) {
cxoError_raiseAndReturnInt();
dpiVar_release(tempVarHandle);
return cxoError_raiseAndReturnInt();
return -1;
}
}
dpiVar_release(var->handle);

7
test/StringVar.py
View File

@ -30,6 +30,13 @@ class TestStringVar(BaseTestCase):
self.rawData.append(dataTuple)
self.dataByKey[i] = dataTuple
def testArrayWithIncreasedSize(self):
"test creating an array var and then increasing the internal size"
val = ["12345678901234567890"] * 3
arrayVar = self.cursor.arrayvar(str, len(val), 4)
arrayVar.setvalue(0, val)
self.assertEqual(arrayVar.getvalue(), val)
def testBindString(self):
"test binding in a string"
self.cursor.execute("""