Rework query and its parameters in QgsHanaFeatureIterator

src/providers/hana/qgshanafeatureiterator.cpp

@@ -91,6 +91,7 @@ QgsHanaFeatureIterator::QgsHanaFeatureIterator(
   try
   {
     mSqlQuery = buildSqlQuery( request );
+    mSqlQueryParams = buildSqlQueryParameters();
 
     rewind();
   }
@@ -111,15 +112,7 @@ bool QgsHanaFeatureIterator::rewind()
     return false;
 
   mResultSet.reset();
-  if ( !( mFilterRect.isNull() || mFilterRect.isEmpty() ) && mSource->isSpatial() && mHasGeometryColumn )
-  {
-    QgsRectangle filterRect = getFilterRect();
-    QString ll = QStringLiteral( "POINT(%1 %2)" ).arg( QString::number( filterRect.xMinimum() ),  QString::number( filterRect.yMinimum() ) );
-    QString ur = QStringLiteral( "POINT(%1 %2)" ).arg( QString::number( filterRect.xMaximum() ),  QString::number( filterRect.yMaximum() ) );
-    mResultSet = mConnection->executeQuery( mSqlQuery, { ll, mSource->mSrid, ur, mSource->mSrid } );
-  }
-  else
-    mResultSet = mConnection->executeQuery( mSqlQuery );
+  mResultSet = mConnection->executeQuery( mSqlQuery, mSqlQueryParams );
 
   return true;
 }
@@ -429,6 +422,18 @@ QString QgsHanaFeatureIterator::buildSqlQuery( const QgsFeatureRequest &request
   return sql;
 }
 
+QVariantList QgsHanaFeatureIterator::buildSqlQueryParameters( ) const
+{
+  if ( !( mFilterRect.isNull() || mFilterRect.isEmpty() ) && mSource->isSpatial() && mHasGeometryColumn )
+  {
+    QgsRectangle filterRect = getFilterRect();
+    QString ll = QStringLiteral( "POINT(%1 %2)" ).arg( QString::number( filterRect.xMinimum() ),  QString::number( filterRect.yMinimum() ) );
+    QString ur = QStringLiteral( "POINT(%1 %2)" ).arg( QString::number( filterRect.xMaximum() ),  QString::number( filterRect.yMaximum() ) );
+    return { ll, mSource->mSrid, ur, mSource->mSrid };
+  }
+  return QVariantList();
+}
+
 QgsHanaFeatureSource::QgsHanaFeatureSource( const QgsHanaProvider *p )
   : mDatabaseVersion( p->mDatabaseVersion )
   , mUri( p->mUri )

src/providers/hana/qgshanafeatureiterator.h

@@ -75,6 +75,7 @@ class QgsHanaFeatureIterator : public QgsAbstractFeatureIteratorFromSource<QgsHa
     bool prepareOrderBy( const QList<QgsFeatureRequest::OrderByClause> &orderBys ) override;
 
     QString buildSqlQuery( const QgsFeatureRequest &request );
+    QVariantList buildSqlQueryParameters( ) const;
     QString getBBOXFilter() const;
     QgsRectangle getFilterRect() const;
 
@@ -83,6 +84,7 @@ class QgsHanaFeatureIterator : public QgsAbstractFeatureIteratorFromSource<QgsHa
     QgsHanaConnectionRef mConnection;
     QgsHanaResultSetRef mResultSet;
     QString mSqlQuery;
+    QVariantList mSqlQueryParams;
     QgsRectangle mFilterRect;
     const QgsRectangle mSrsExtent;
     QgsAttributeList mAttributesToFetch;