Support Unicode queries in QgsHanaFeatureIterator

qgis · Dec 7, 2020 · da0dbf9 · da0dbf9
1 parent a33b6d7
commit da0dbf9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/providers/hana/qgshanafeatureiterator.cpp b/src/providers/hana/qgshanafeatureiterator.cpp
@@ -27,6 +27,7 @@
 #include "qgssettings.h"
 
 #include "odbc/Connection.h"
+#include "odbc/Exception.h"
 #include "odbc/PreparedStatement.h"
 #include "odbc/ResultSet.h"
 
@@ -74,9 +75,9 @@ QgsHanaFeatureIterator::QgsHanaFeatureIterator(
 
   try
   {
-    QString sql = buildSQLStatement( request );
-    PreparedStatementRef stmt = mConnRef->getNativeRef()->prepareStatement( sql.toStdString().c_str() );
-    mSqlStatement = sql;
+    QString sql = buildSqlQuery( request );
+    PreparedStatementRef stmt = mConnRef->getNativeRef()->prepareStatement( reinterpret_cast<const char16_t *>( sql.unicode() ) );
+    mSqlQuery = sql;
     mClosed = false;
 
     rewind();
@@ -100,7 +101,7 @@ bool QgsHanaFeatureIterator::rewind()
     return false;
 
   mResultSet.reset();
-  PreparedStatementRef stmt = mConnRef->getNativeRef()->prepareStatement( mSqlStatement.toStdString().c_str() );
+  PreparedStatementRef stmt =  mConnRef->getNativeRef()->prepareStatement( reinterpret_cast<const char16_t *>( mSqlQuery.unicode() ) );
   mResultSet = QgsHanaResultSet::create( stmt );
   return true;
 }
@@ -214,7 +215,7 @@ bool QgsHanaFeatureIterator::prepareOrderBy( const QList<QgsFeatureRequest::Orde
   return mOrderByCompiled;
 }
 
-QString QgsHanaFeatureIterator::buildSQLStatement( const QgsFeatureRequest &request )
+QString QgsHanaFeatureIterator::buildSqlQuery( const QgsFeatureRequest &request )
 {
   bool limitAtProvider = ( mRequest.limit() >= 0 );
   QgsRectangle filterRect = mFilterRect;

diff --git a/src/providers/hana/qgshanafeatureiterator.h b/src/providers/hana/qgshanafeatureiterator.h
@@ -73,13 +73,13 @@ class QgsHanaFeatureIterator : public QgsAbstractFeatureIteratorFromSource<QgsHa
   private:
     bool prepareOrderBy( const QList<QgsFeatureRequest::OrderByClause> &orderBys ) override;
 
-    QString buildSQLStatement( const QgsFeatureRequest &request );
+    QString buildSqlQuery( const QgsFeatureRequest &request );
     QString getBBOXFilter( const QgsRectangle &bbox, const QVersionNumber &dbVersion ) const;
 
   private:
     QgsHanaConnectionRef mConnRef;
     QgsHanaResultSetRef mResultSet;
-    QString mSqlStatement = QString( "" );
+    QString mSqlQuery = QString( "" );
     QgsRectangle mFilterRect;
     QgsRectangle mSrsExtent;
     QgsAttributeList mAttributesToFetch;