sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove meaningless conditional and improve user input handling

Browse Source
This commit is contained in:
Björn Harrtell 2018-10-31 14:45:37 +01:00 committed by Jürgen Fischer
parent 429cd0bacd
commit 4ab377b92f
1 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/providers/oracle/ocispatial/qsql_ocispatial.cpp
View File

@ -490,29 +490,23 @@ void QOCISpatialResultPrivate::setStatementAttributes()
int r = OCI_SUCCESS;
if ( prefetchRows >= 0 )
{
r = OCIAttrSet( sql,
OCI_HTYPE_STMT,
&prefetchRows,
0,
OCI_ATTR_PREFETCH_ROWS,
err );
if ( r != OCI_SUCCESS )
qOraWarning( "Couldn't set OCI_ATTR_PREFETCH_ROWS: ", err );
}
if ( prefetchMem >= 0 )
{
r = OCIAttrSet( sql,
OCI_HTYPE_STMT,
&prefetchMem,
0,
OCI_ATTR_PREFETCH_MEMORY,
err );
if ( r != OCI_SUCCESS )
qOraWarning( "QOCISpatialResultPrivate::setStatementAttributes:"
" Couldn't set OCI_ATTR_PREFETCH_MEMORY: ", err );
}
r = OCIAttrSet( sql,
OCI_HTYPE_STMT,
&prefetchRows,
0,
OCI_ATTR_PREFETCH_ROWS,
err );
if ( r != OCI_SUCCESS )
qOraWarning( "Couldn't set OCI_ATTR_PREFETCH_ROWS: ", err );
r = OCIAttrSet( sql,
OCI_HTYPE_STMT,
&prefetchMem,
0,
OCI_ATTR_PREFETCH_MEMORY,
err );
if ( r != OCI_SUCCESS )
qOraWarning( "QOCISpatialResultPrivate::setStatementAttributes:"
" Couldn't set OCI_ATTR_PREFETCH_MEMORY: ", err );
}
int QOCISpatialResultPrivate::bindValue( OCIStmt *sql, OCIBind **hbnd, OCIError *err, int pos,
@ -3832,15 +3826,19 @@ static void qParseOpts( const QString &options, QOCISpatialDriverPrivate *d )
bool ok;
if ( opt == QLatin1String( "OCI_ATTR_PREFETCH_ROWS" ) )
{
d->prefetchRows = val.toInt( &ok );
int intVal = val.toInt( &ok );
if ( !ok )
d->prefetchRows = QOCISPATIAL_PREFETCH_ROWS;
else if ( intVal >= 0 )
d->prefetchRows = static_cast<ub4>( intVal );
}
else if ( opt == QLatin1String( "OCI_ATTR_PREFETCH_MEMORY" ) )
{
d->prefetchMem = val.toInt( &ok );
int intVal = val.toInt( &ok );
if ( !ok )
d->prefetchMem = QOCISPATIAL_PREFETCH_MEM;
else if ( intVal >= 0 )
d->prefetchMem = static_cast<ub4>( intVal );
}
else
{