HANA: Set query BBOX values via set parameter function in PreparedSta…

…tement
qgis · Dec 7, 2020 · 238db50 · 238db50
1 parent 550abfd
commit 238db50
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 20 deletions.
diff --git a/src/providers/hana/qgshanadriver.h b/src/providers/hana/qgshanadriver.h
@@ -23,6 +23,7 @@
 
 class QgsHanaDriver
 {
+  private:
     QgsHanaDriver();
     ~QgsHanaDriver();
 

diff --git a/src/providers/hana/qgshanafeatureiterator.cpp b/src/providers/hana/qgshanafeatureiterator.cpp
@@ -91,7 +91,15 @@ bool QgsHanaFeatureIterator::rewind()
     return false;
 
   mResultSet.reset();
-  mResultSet = mConnection->executeQuery( mSqlQuery );
+  if ( !( mFilterRect.isNull() || mFilterRect.isEmpty() ) && mSource->isSpatial() && mHasGeometryColumn )
+  {
+    QString ll = QStringLiteral( "POINT(%1 %2)" ).arg( QString::number( mFilterRect.xMinimum() ),  QString::number( mFilterRect.yMinimum() ) );
+    QString ur = QStringLiteral( "POINT(%1 %2)" ).arg( QString::number( mFilterRect.xMaximum() ),  QString::number( mFilterRect.yMaximum() ) );
+    mResultSet = mConnection->executeQuery( mSqlQuery, { ll, mSource->mSrid, ur, mSource->mSrid } );
+  }
+  else
+    mResultSet = mConnection->executeQuery( mSqlQuery );
+
   return true;
 }
 
@@ -173,22 +181,14 @@ bool QgsHanaFeatureIterator::nextFeatureFilterExpression( QgsFeature &feature )
     return fetchFeature( feature );
 }
 
-QString QgsHanaFeatureIterator::getBBOXFilter( const QgsRectangle &bbox,
-    const QVersionNumber &dbVersion ) const
+QString QgsHanaFeatureIterator::getBBOXFilter( const QVersionNumber &dbVersion ) const
 {
   if ( dbVersion.majorVersion() == 1 )
-  {
-    return QStringLiteral( "%1.ST_SRID(%2).ST_IntersectsRect(ST_GeomFromText('Point(%3 %4)', %2), ST_GeomFromText('Point(%5 %6)', %2)) = 1" )
-           .arg( QgsHanaUtils::quotedIdentifier( mSource->mGeometryColumn ), QString::number( mSource->mSrid ),
-                 qgsDoubleToString( bbox.xMinimum() ), qgsDoubleToString( bbox.yMinimum() ),
-                 qgsDoubleToString( bbox.xMaximum() ), qgsDoubleToString( bbox.yMaximum() ) );
-  }
+    return QStringLiteral( "%1.ST_SRID(%2).ST_IntersectsRect(ST_GeomFromText(?, ?), ST_GeomFromText(?, ?)) = 1" )
+           .arg( QgsHanaUtils::quotedIdentifier( mSource->mGeometryColumn ), QString::number( mSource->mSrid ) );
   else
-    return QStringLiteral( "%1.ST_IntersectsRectPlanar(ST_GeomFromText('Point(%2 %3)', %6), ST_GeomFromText('Point(%4 %5)', %6)) = 1" )
-           .arg( QgsHanaUtils::quotedIdentifier( mSource->mGeometryColumn ),
-                 qgsDoubleToString( bbox.xMinimum() ), qgsDoubleToString( bbox.yMinimum() ),
-                 qgsDoubleToString( bbox.xMaximum() ), qgsDoubleToString( bbox.yMaximum() ),
-                 QString::number( mSource->mSrid ) );
+    return QStringLiteral( "%1.ST_IntersectsRectPlanar(ST_GeomFromText(?, ?), ST_GeomFromText(?, ?)) = 1" )
+           .arg( QgsHanaUtils::quotedIdentifier( mSource->mGeometryColumn ) );
 }
 
 bool QgsHanaFeatureIterator::prepareOrderBy( const QList<QgsFeatureRequest::OrderByClause> &orderBys )
@@ -322,7 +322,7 @@ QString QgsHanaFeatureIterator::buildSqlQuery( const QgsFeatureRequest &request
   QString sqlFilter;
   // Set spatial filter
   if ( !( filterRect.isNull() || filterRect.isEmpty() ) && mSource->isSpatial() && mHasGeometryColumn )
-    sqlFilter = getBBOXFilter( filterRect, QgsHanaUtils::toHANAVersion( mConnection->getDatabaseVersion() ) );
+    sqlFilter = getBBOXFilter( QgsHanaUtils::toHANAVersion( mConnection->getDatabaseVersion() ) );
 
   if ( !mSource->mQueryWhereClause.isEmpty() )
     sqlFilter = andWhereClauses( sqlFilter, mSource->mQueryWhereClause );

diff --git a/src/providers/hana/qgshanafeatureiterator.h b/src/providers/hana/qgshanafeatureiterator.h
@@ -74,7 +74,7 @@ class QgsHanaFeatureIterator : public QgsAbstractFeatureIteratorFromSource<QgsHa
     bool prepareOrderBy( const QList<QgsFeatureRequest::OrderByClause> &orderBys ) override;
 
     QString buildSqlQuery( const QgsFeatureRequest &request );
-    QString getBBOXFilter( const QgsRectangle &bbox, const QVersionNumber &dbVersion ) const;
+    QString getBBOXFilter( const QVersionNumber &dbVersion ) const;
 
   private:
     QgsHanaConnectionRef mConnection;

diff --git a/src/providers/hana/qgshanaproviderconnection.h b/src/providers/hana/qgshanaproviderconnection.h
@@ -23,14 +23,10 @@
 class QgsHanaProviderConnection : public QgsAbstractDatabaseProviderConnection
 {
   public:
-
     QgsHanaProviderConnection( const QString &name );
     QgsHanaProviderConnection( const QString &uri, const QVariantMap &configuration );
 
-    // QgsAbstractProviderConnection interface
-
   public:
-
     void createVectorTable( const QString &schema,
                             const QString &name,
                             const QgsFields &fields,

diff --git a/src/providers/hana/qgshanaresultset.h b/src/providers/hana/qgshanaresultset.h
@@ -40,6 +40,7 @@ class QgsHanaResultSet
 {
   private:
     friend class QgsHanaConnection;
+
   private:
     QgsHanaResultSet( ResultSetRef &&resultSet );